diff options
| author | Ben Littler <tempn@twmi.rr.com> | 2008-12-16 05:20:11 +0000 |
|---|---|---|
| committer | Ben Littler <tempn@twmi.rr.com> | 2008-12-16 05:20:11 +0000 |
| commit | 4a49a5fdfc30793040e757b152efdb261534b8db (patch) | |
| tree | 7f81364ae351e601d0a25994b511bc8680ef3d25 /libavformat/riff.c | |
| parent | a9cf309b961293020d260d622bafb047c16946d0 (diff) | |
| download | ffmpeg-4a49a5fdfc30793040e757b152efdb261534b8db.tar.gz | |
two more mpeg4 fourccs and one msmpeg4v3 from uncommon codec list
Originally committed as revision 16162 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index b6c67cad6c..b48dd983df 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -57,6 +57,7 @@ const AVCodecTag codec_bmp_tags[] = { { CODEC_ID_MPEG4, MKTAG('R', 'M', 'P', '4') }, { CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, { CODEC_ID_MPEG4, MKTAG('F', 'F', 'D', 'S') }, + { CODEC_ID_MPEG4, MKTAG('F', 'V', 'F', 'W') }, { CODEC_ID_MPEG4, MKTAG('D', 'C', 'O', 'D') }, { CODEC_ID_MPEG4, MKTAG('M', 'V', 'X', 'M') }, { CODEC_ID_MPEG4, MKTAG('P', 'M', '4', 'V') }, @@ -68,12 +69,14 @@ const AVCodecTag codec_bmp_tags[] = { { CODEC_ID_MPEG4, MKTAG('H', 'D', 'X', '4') }, /* flipped video */ { CODEC_ID_MPEG4, MKTAG('D', 'M', 'K', '2') }, { CODEC_ID_MPEG4, MKTAG('D', 'I', 'G', 'I') }, + { CODEC_ID_MPEG4, MKTAG('I', 'N', 'M', 'C') }, { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */ { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') }, { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '5') }, { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '6') }, { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '4') }, + { CODEC_ID_MSMPEG4V3, MKTAG('D', 'V', 'X', '3') }, { CODEC_ID_MSMPEG4V3, MKTAG('A', 'P', '4', '1') }, { CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '1') }, { CODEC_ID_MSMPEG4V3, MKTAG('C', 'O', 'L', '0') }, |