# HG changeset patch # User cehoyos # Date 1260316065 0 # Node ID ccc14dcb3460c6ed87c67d442a0bbefc6e01bef1 # Parent 9ee7e675a476327e842bfe773441d6ae8b2d4022 Support AVI1 and AVI2 in avi as MJPEG. Fixes issue 1602. diff -r 9ee7e675a476 -r ccc14dcb3460 riff.c --- a/riff.c Tue Dec 08 12:34:08 2009 +0000 +++ b/riff.c Tue Dec 08 23:47:45 2009 +0000 @@ -134,6 +134,8 @@ { 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') },