Mercurial > libavformat.hg

changeset 5426:ccc14dcb3460 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support AVI1 and AVI2 in avi as MJPEG. Fixes issue 1602.
author cehoyos
date Tue, 08 Dec 2009 23:47:45 +0000
parents 9ee7e675a476
children d275ae9aa603
files riff.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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') },