diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-12-08 23:47:45 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-12-08 23:47:45 +0000 |
| commit | 4b86926b95e08f8a6ae46182d6d8eff5ef1bfda0 (patch) | |
| tree | 3872b4ccd0f137f40c3d1c5db01ea53cd6178806 /libavformat/riff.c | |
| parent | 24b403f3b753ff2c2dadffabffaafc06dff96760 (diff) | |
Support AVI1 and AVI2 in avi as MJPEG.
Fixes issue 1602.
Originally committed as revision 20781 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 3ea32420f2..06cffa0273 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -134,6 +134,8 @@ const AVCodecTag ff_codec_bmp_tags[] = { { CODEC_ID_MJPEG, MKTAG('C', 'J', 'P', 'G') }, /* Creative Webcam JPEG */ { CODEC_ID_MJPEG, MKTAG('I', 'J', 'L', 'V') }, /* Intel JPEG Library Video Codec */ { CODEC_ID_MJPEG, MKTAG('M', 'V', 'J', 'P') }, /* Midvid JPEG Video Codec */ + { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') }, + { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') }, { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') }, |