(Partly) support Metasoft MJPEG Codec, fixes half of issue 1611.

Originally committed as revision 20796 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index a1839ac124e806fa3ddf70cd0ab59610b0b87dba..86862dbd40ff5ae6cbee0f3bf3c14e75bd318b20 100644 (file)
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1182,7 +1182,8 @@ static int mjpeg_decode_com(MJpegDecodeContext *s)
             else if(!strcmp(cbuf, "CS=ITU601")){
                 s->cs_itu601= 1;
             }
-            else if(len > 20 && !strncmp(cbuf, "Intel(R) JPEG Library", 21)){
+            else if((len > 20 && !strncmp(cbuf, "Intel(R) JPEG Library", 21)) ||
+                    (len > 19 && !strncmp(cbuf, "Metasoft MJPEG Codec", 20))){
                 s->flipped = 1;
             }
 

diff --git a/libavformat/riff.c b/libavformat/riff.c
index ca9e6ff3d752b7b2414f5211ac65ac8767c56b88..e1d0b2e085a1fb5707f74ef9840c02505d7cf421 100644 (file)
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -138,6 +138,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { 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_MJPEG,        MKTAG('M', 'T', 'S', 'J') },
     { CODEC_ID_HUFFYUV,      MKTAG('H', 'F', 'Y', 'U') },
     { CODEC_ID_FFVHUFF,      MKTAG('F', 'F', 'V', 'H') },
     { CODEC_ID_CYUV,         MKTAG('C', 'Y', 'U', 'V') },