diff options
| author | Ben Littler <tempn@twmi.rr.com> | 2008-12-03 21:44:29 +0000 |
|---|---|---|
| committer | Ben Littler <tempn@twmi.rr.com> | 2008-12-03 21:44:29 +0000 |
| commit | 26e8d342c0bb780d041b11f9e4ed6f6e09f07602 (patch) | |
| tree | 583fa8d0deb569d250483f95c09a73ffc66ba4ce | |
| parent | b0e8ce55aec5efcb3cd83e511e88f7957574ece7 (diff) | |
| download | ffmpeg-26e8d342c0bb780d041b11f9e4ed6f6e09f07602.tar.gz | |
add fourccs from avi files
Originally committed as revision 15995 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/riff.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 52eb91d9cf..3b3b47b335 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -33,6 +33,8 @@ const AVCodecTag codec_bmp_tags[] = { { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, { CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') }, { 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_H263P, MKTAG('H', '2', '6', '3') }, { CODEC_ID_H263I, MKTAG('I', '2', '6', '3') }, /* intel h263 */ { CODEC_ID_H261, MKTAG('H', '2', '6', '1') }, @@ -54,7 +56,15 @@ 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('D', 'C', 'O', 'D') }, + { CODEC_ID_MPEG4, MKTAG('M', 'V', 'X', 'M') }, + { CODEC_ID_MPEG4, MKTAG('P', 'M', '4', 'V') }, + { CODEC_ID_MPEG4, MKTAG('S', 'M', 'P', '4') }, + { CODEC_ID_MPEG4, MKTAG('D', 'X', 'G', 'M') }, + { CODEC_ID_MPEG4, MKTAG('V', 'I', 'D', 'M') }, + { 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_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') }, @@ -67,6 +77,7 @@ const AVCodecTag codec_bmp_tags[] = { { CODEC_ID_MSMPEG4V2, MKTAG('M', 'P', '4', '2') }, { CODEC_ID_MSMPEG4V2, MKTAG('D', 'I', 'V', '2') }, { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', 'G', '4') }, + { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', '4', '1') }, { CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') }, { CODEC_ID_WMV2, MKTAG('W', 'M', 'V', '2') }, { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd') }, @@ -75,11 +86,13 @@ const AVCodecTag codec_bmp_tags[] = { { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '2', '5') }, { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', '0') }, { CODEC_ID_DVVIDEO, MKTAG('c', 'd', 'v', 'c') }, /* Canopus DV */ + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '1') }, { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'g', '2') }, { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', '2') }, { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'P', 'E', 'G') }, { CODEC_ID_MPEG1VIDEO, MKTAG('P', 'I', 'M', '1') }, + { CODEC_ID_MPEG2VIDEO, MKTAG('P', 'I', 'M', '2') }, { CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') }, { CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) }, { CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) }, @@ -87,6 +100,7 @@ const AVCodecTag codec_bmp_tags[] = { { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') }, { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') }, + { CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, { CODEC_ID_LJPEG, MKTAG('L', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */ { CODEC_ID_JPEGLS, MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */ |