diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-08 22:33:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-08 22:33:32 +0200 |
| commit | ca1f2b3e10b79958d36db296f142fbd232f997e6 (patch) | |
| tree | 4ed519b7bf7ece90209c4e2e0f1c81423bf16f19 /libavformat/id3v2.c | |
| parent | d8ce478c43d9096bcf38b50c849e9ed45647542d (diff) | |
| parent | 66a297975d19e0d9b8a5ff8a723dcd2116a506ce (diff) | |
| download | ffmpeg-ca1f2b3e10b79958d36db296f142fbd232f997e6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cmutils: include shellapi.h on Win32 (for CommandLineToArgvW).
x86/timer: implement an intrinsic-based version for rdtsc (AV_READ_TIME).
id3v2: add a mimetype for bmp pictures.
flacdec: be less strict when parsing attached pictures.
flacdec: don't create an attached picture stream until we have all information.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/id3v2.c')
| -rw-r--r-- | libavformat/id3v2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 216d4a2e57..9ccd8f2d07 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -130,6 +130,7 @@ const CodecMime ff_id3v2_mime_tags[] = { {"image/jpg", CODEC_ID_MJPEG}, {"image/png" , CODEC_ID_PNG}, {"image/tiff", CODEC_ID_TIFF}, + {"image/bmp", CODEC_ID_BMP}, {"", CODEC_ID_NONE}, }; |