diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-18 13:36:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-18 13:36:39 +0100 |
| commit | 17596198cacbb7277f1d9641f0a76fe62ebf155d (patch) | |
| tree | 1c35aa3df1c1b2b92f942b5f83b3f80ea42d0ad5 /libavformat/riff.c | |
| parent | a003c5bd4ff1846edba0518306f8091c14041c96 (diff) | |
| parent | 80ac87c13dc8c6c063e26a464c5c542357c0583f (diff) | |
| download | ffmpeg-17596198cacbb7277f1d9641f0a76fe62ebf155d.tar.gz | |
Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'
* commit '80ac87c13dc8c6c063e26a464c5c542357c0583f':
lavc: support ZenoXVID custom tag
libcdio: support recent cdio-paranoia
float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
theora: Skip zero-sized headers
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 573e4179cd..508beb1f0b 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -62,6 +62,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') }, { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, { AV_CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 0 ) }, /* some broken avi use this */ + { AV_CODEC_ID_MPEG4, MKTAG('Z', 'M', 'P', '4') }, /* some broken avi use this */ { AV_CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', '1') }, { AV_CODEC_ID_MPEG4, MKTAG('B', 'L', 'Z', '0') }, { AV_CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, |