diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-03-09 14:06:40 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-03-09 14:06:40 +0100 |
| commit | 260c12cdd1df1379089b0256451670945e27121c (patch) | |
| tree | 2e637cbf7ec5fe1a83eef696e4cf48b3225c1d24 /libavcodec/mjpegdec.c | |
| parent | a6a52ef29ac2e8b9cdba110f076b544f98fbf646 (diff) | |
| download | ffmpeg-260c12cdd1df1379089b0256451670945e27121c.tar.gz | |
lavc/mjpegdec: Set sar for multiscope videos.
Fixes decoding of the files from ticket #4535 visually.
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 3e4b6f044c..a6fb41043f 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); } |