[FFmpeg-devel] [PATCH]lavc/mjpegdec: Only set SAR if resolution is available

[Carl Eugen Hoyos]

On Tuesday 19 January 2016 02:09:06 am Michael Niedermayer wrote:
> On Tue, Jan 19, 2016 at 12:33:40AM +0100, Carl Eugen Hoyos wrote:
> > Hi!
> >
> > Attached patch fixes ticket #4479 here.
> >
> > Please comment, Carl Eugen
>
> if w/h is set at that point then their values may be unrelated to the
> actual w/h values thus the set_sar there is wrong even if w/h is set
>
> the patch is fine, iam not sure if the call shouldnt be (re)moved
> though moving it might be somewhat non trivial

The attached patch also fixes ticket #4479 for me.

Thank you, Carl Eugen
-------------- next part --------------
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index b1c5b67..9b2a43f 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1653,7 +1653,6 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
 
         s->avctx->sample_aspect_ratio.num = get_bits(&s->gb, 16);
         s->avctx->sample_aspect_ratio.den = get_bits(&s->gb, 16);
-        ff_set_sar(s->avctx, s->avctx->sample_aspect_ratio);
 
         if (s->avctx->debug & FF_DEBUG_PICT_INFO)
             av_log(s->avctx, AV_LOG_INFO,