History

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

Jason Garrett-Glaser committed 17 years ago

Commit bc7ea1e1 parent 17dbe251 file · +1 −0Browse files

Unified · Split

libavformat/riff.c+1−0
@@ -112,6 +112,7 @@ const AVCodecTag codec_bmp_tags[] = { · 111 unmodified lines
112 { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') },112 { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') },
113 { CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) },113 { CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) },
114 { CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) },114 { CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) },
115 { CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 16) },
115 { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') },116 { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') },
116 { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') },117 { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') },
117 { CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */118 { CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t