diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-31 22:41:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-31 22:41:00 +0200 |
| commit | d1dad7c824c14939a0e18fa262f3e51957de6e3e (patch) | |
| tree | 615f6ba80611f53e520d2ae479d9d4409077a78d /libavcodec/bmp.c | |
| parent | d2ca5dd0f33b0fdbb5d2a7429c8f71ff1dffffb7 (diff) | |
| parent | f2ed006c90ccb65cd143d8b0fcfc28ffb98c4289 (diff) | |
| download | ffmpeg-streaming-d1dad7c824c14939a0e18fa262f3e51957de6e3e.zip ffmpeg-streaming-d1dad7c824c14939a0e18fa262f3e51957de6e3e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpc8: return more meaningful error codes.
mpc: return more meaningful error codes.
wv,mpc8: don't return apetag data in packets.
rtmp: do not warn about receiving metadata packets
x86: h264dsp: Adjust YASM #ifdefs
x86: yadif: Mark mmxext optimizations as such
h264: convert loop filter strength dsp function to yasm.
Improve descriptiveness of a number of codec and container long names
Conflicts:
libavcodec/flvdec.c
libavcodec/libopenjpegdec.c
libavformat/apetag.c
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bmp.c')
| -rw-r--r-- | libavcodec/bmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index b6bc830..91e0829 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -358,5 +358,5 @@ AVCodec ff_bmp_decoder = { .close = bmp_decode_end, .decode = bmp_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("BMP image"), + .long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"), }; |
