[FFmpeg-cvslog] lavc/mjpegdec: Set sar for multiscope videos.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Mar  9 14:06:40 2016 +0100| [260c12cdd1df1379089b0256451670945e27121c] | committer: Carl Eugen Hoyos

lavc/mjpegdec: Set sar for multiscope videos.

Fixes decoding of the files from ticket #4535 visually.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=260c12cdd1df1379089b0256451670945e27121c
---

 libavcodec/mjpegdec.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 3e4b6f0..a6fb410 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -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);
         }