[FFmpeg-cvslog] r21032 - trunk/libavformat/riff.c

[compn]

Author: compn
Date: Tue Jan  5 21:14:50 2010
New Revision: 21032

Log:
add another mjpeg fourcc to riff.c list

Modified:
   trunk/libavformat/riff.c

Modified: trunk/libavformat/riff.c
==============================================================================
--- trunk/libavformat/riff.c	Tue Jan  5 17:25:41 2010	(r21031)
+++ trunk/libavformat/riff.c	Tue Jan  5 21:14:50 2010	(r21032)
@@ -139,6 +139,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { 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') },