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

[cehoyos]

Author: cehoyos
Date: Mon May 10 01:19:19 2010
New Revision: 23076

Log:
Add FourCC MJPG for CODEC_ID_JPEGLS.

Patch by Francesco Lavra, francescolavra interfree it

Modified:
   trunk/libavformat/riff.c

Modified: trunk/libavformat/riff.c
==============================================================================
--- trunk/libavformat/riff.c	Mon May 10 01:04:06 2010	(r23075)
+++ trunk/libavformat/riff.c	Mon May 10 01:19:19 2010	(r23076)
@@ -129,6 +129,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { CODEC_ID_LJPEG,        MKTAG('L', 'J', 'P', 'G') },
     { CODEC_ID_MJPEG,        MKTAG('J', 'P', 'G', 'L') }, /* Pegasus lossless JPEG */
     { CODEC_ID_JPEGLS,       MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - encoder */
+    { CODEC_ID_JPEGLS,       MKTAG('M', 'J', 'P', 'G') },
     { CODEC_ID_MJPEG,        MKTAG('M', 'J', 'L', 'S') }, /* JPEG-LS custom FOURCC for avi - decoder */
     { CODEC_ID_MJPEG,        MKTAG('j', 'p', 'e', 'g') },
     { CODEC_ID_MJPEG,        MKTAG('I', 'J', 'P', 'G') },