diff options
| author | Ben Littler <tempn@twmi.rr.com> | 2008-12-05 14:59:41 +0000 |
|---|---|---|
| committer | Ben Littler <tempn@twmi.rr.com> | 2008-12-05 14:59:41 +0000 |
| commit | 62d6f73edc0073ef2e7c9ac6cc5c1d4a84aa94a9 (patch) | |
| tree | ada632a383af926866d37d59aecd991834f42a04 /libavformat/riff.c | |
| parent | 36d5b17514e63c90edd92281539088b1879764e0 (diff) | |
| download | ffmpeg-62d6f73edc0073ef2e7c9ac6cc5c1d4a84aa94a9.tar.gz | |
add VX1K h263 and DMK2 mpeg4 avi fourccs
Originally committed as revision 16009 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 3b3b47b335..97d75513ac 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -35,6 +35,7 @@ const AVCodecTag codec_bmp_tags[] = { { CODEC_ID_H263, MKTAG('H', '2', '6', '3') }, { CODEC_ID_H263, MKTAG('X', '2', '6', '3') }, { CODEC_ID_H263, MKTAG('L', '2', '6', '3') }, + { CODEC_ID_H263, MKTAG('V', 'X', '1', 'K') }, { CODEC_ID_H263P, MKTAG('H', '2', '6', '3') }, { CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */ { CODEC_ID_H261, MKTAG('H', '2', '6', '1') }, @@ -65,6 +66,7 @@ const AVCodecTag codec_bmp_tags[] = { { CODEC_ID_MPEG4, MKTAG('M', '4', 'T', '3') }, { CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'X') }, { CODEC_ID_MPEG4, MKTAG('H', 'D', 'X', '4') }, /* flipped video */ + { CODEC_ID_MPEG4, MKTAG('D', 'M', 'K', '2') }, { 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') }, |