diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-30 06:03:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-30 06:05:39 +0200 |
| commit | 2b7c0c9fe10c2c702a3f2741d0f29b284f78d1ea (patch) | |
| tree | ea8b7dfd1302e2288ab05a6297aa22058c7ee954 /libavformat/id3v2.c | |
| parent | d3d5e84f33496f7c6ed704d53998db97a69f02e8 (diff) | |
| parent | a05c41acd1e2dc0b7f6d82fa5ecbf7b8b5514ebc (diff) | |
| download | ffmpeg-2b7c0c9fe10c2c702a3f2741d0f29b284f78d1ea.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mp3dec: perform I/S and M/S only when frame mode is joint stereo.
id3v2: add another mimetype for JPEG image
lzw: prevent buffer overreads.
WMAL: Remove inaccurate and unnecessary doxy
h264: fix cabac-on-stack after safe cabac reader.
truemotion2: convert packet header reading to bytestream2.
Conflicts:
libavcodec/lzw.c
libavcodec/truemotion2.c
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/id3v2.c')
| -rw-r--r-- | libavformat/id3v2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 3de993ea9f..16eff7e27d 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -127,7 +127,7 @@ const char *ff_id3v2_picture_types[21] = { const CodecMime ff_id3v2_mime_tags[] = { {"image/gif" , CODEC_ID_GIF}, {"image/jpeg", CODEC_ID_MJPEG}, - {"image/jpg" , CODEC_ID_MJPEG}, + {"image/jpg", CODEC_ID_MJPEG}, {"image/png" , CODEC_ID_PNG}, {"image/tiff", CODEC_ID_TIFF}, {"", CODEC_ID_NONE}, |