Metasoft MJPEG codec has Cb and Cr swapped, fixes issue 1611.

Originally committed as revision 21451 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Carl Eugen Hoyos 15 years ago
parent 6022255774
commit ddee80f384
  1. 4
      libavcodec/mjpegdec.c

@ -920,6 +920,10 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s)
av_log(s->avctx, AV_LOG_ERROR, "decode_sos: index(%d) out of components\n", index); av_log(s->avctx, AV_LOG_ERROR, "decode_sos: index(%d) out of components\n", index);
return -1; return -1;
} }
/* Metasoft MJPEG codec has Cb and Cr swapped */
if (s->avctx->codec_tag == MKTAG('M', 'T', 'S', 'J')
&& nb_components == 3 && s->nb_components == 3 && i)
index = 3 - i;
s->comp_index[i] = index; s->comp_index[i] = index;

Loading…
Cancel
Save