[FFmpeg-cvslog] Do not try to use lowres for unusual jpg subsampling.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Mar 29 13:09:37 2012 +0200| [282ec7289d669e0297ad19ea492e086720e1bdcb] | committer: Carl Eugen Hoyos

Do not try to use lowres for unusual jpg subsampling.

Fixes ticket #1144.

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

 libavcodec/mjpegdec.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index d369518..0df0b27 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)