lavc/mjpegdec: Set sar for multiscope videos.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Wed, 9 Mar 2016 13:06:40 +0000 (14:06 +0100)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Wed, 9 Mar 2016 13:06:40 +0000 (14:06 +0100)
Fixes decoding of the files from ticket #4535 visually.

libavcodec/mjpegdec.c

index 3e4b6f0..a6fb410 100644 (file)
@@ -1878,8 +1878,10 @@ static int mjpeg_decode_com(MJpegDecodeContext *s)
             else if ((!strncmp(cbuf, "Intel(R) JPEG Library, version 1", 32) && s->avctx->codec_tag) ||
                      (!strncmp(cbuf, "Metasoft MJPEG Codec", 20)))
                 s->flipped = 1;
-            else if (!strcmp(cbuf, "MULTISCOPE II"))
+            else if (!strcmp(cbuf, "MULTISCOPE II")) {
+                s->avctx->sample_aspect_ratio = (AVRational) { 1, 2 };
                 s->multiscope = 2;
+            }
 
             av_free(cbuf);
         }