From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Thu, 29 Mar 2012 11:09:37 +0000 (+0200)
Subject: Do not try to use lowres for unusual jpg subsampling.
X-Git-Tag: android-x86-4.4-r1~12684
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=282ec7289d669e0297ad19ea492e086720e1bdcb;p=android-x86%2Fexternal-ffmpeg.git

Do not try to use lowres for unusual jpg subsampling.

Fixes ticket #1144.
---

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index d369518e69..0df0b27137 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -411,6 +411,10 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
         av_log(s->avctx, AV_LOG_ERROR, "Unhandled pixel format 0x%x\n", pix_fmt_id);
         return -1;
     }
+    if ((s->upscale_h || s->upscale_v) && s->avctx->lowres) {
+        av_log(s->avctx, AV_LOG_ERROR, "lowres not supported for weird subsampling\n");
+        return AVERROR_PATCHWELCOME;
+    }
     if (s->ls) {
         s->upscale_h = s->upscale_v = 0;
         if (s->nb_components > 1)