diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2009-06-18 19:31:12 +0000 |
|---|---|---|
| committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2009-06-18 19:31:12 +0000 |
| commit | bc7ea1e5cf8ae619feb24e0f0590ba658d55e91b (patch) | |
| tree | bd5c5d38e398eab085f6afa556fbeafea281165a | |
| parent | 17dbe25438555b9fea85b057d1f39c054b6d4164 (diff) | |
| download | ffmpeg-bc7ea1e5cf8ae619feb24e0f0590ba658d55e91b.tar.gz | |
Add fourcc 0x10000004, seems to actually be MPEG4. Fixes a problematic AVI file.
Originally committed as revision 19219 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -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 a279121369..fbd40d4727 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -112,6 +112,7 @@ const AVCodecTag codec_bmp_tags[] = { { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') }, { CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) }, { CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) }, + { CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 16) }, { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') }, { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') }, { CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */ |