Do not try to use lowres for unusual jpg subsampling.

Fixes ticket #1144.
pull/4/head
Carl Eugen Hoyos 13 years ago
parent 9a0f2b7b3a
commit 282ec7289d
  1. 4
      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)

Loading…
Cancel
Save