# HG changeset patch # User compn # Date 1262722490 0 # Node ID e81fb2bec96207fb55a2bca40ae2654bf3fcf84d # Parent 59df3b64dc89aaa2de714ad0791b6149fda669db add another mjpeg fourcc to riff.c list diff -r 59df3b64dc89 -r e81fb2bec962 riff.c --- a/riff.c Mon Jan 04 22:59:43 2010 +0000 +++ b/riff.c Tue Jan 05 20:14:50 2010 +0000 @@ -139,6 +139,7 @@ { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '1') }, { CODEC_ID_MJPEG, MKTAG('A', 'V', 'I', '2') }, { CODEC_ID_MJPEG, MKTAG('M', 'T', 'S', 'J') }, + { CODEC_ID_MJPEG, MKTAG('Z', 'J', 'P', 'G') }, /* Paradigm Matrix M-JPEG Codec */ { CODEC_ID_HUFFYUV, MKTAG('H', 'F', 'Y', 'U') }, { CODEC_ID_FFVHUFF, MKTAG('F', 'F', 'V', 'H') }, { CODEC_ID_CYUV, MKTAG('C', 'Y', 'U', 'V') },