diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-08-17 15:53:41 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-08-17 15:53:41 +0200 |
| commit | 84170d4be053a4c7901965fe1977970b5c5e85e5 (patch) | |
| tree | a783c4c98aa6d0f3276afe3ebfcadc24578ff15a /libavcodec | |
| parent | 3afca32561d94f2774adcd82a6a45d78d45f42f3 (diff) | |
| download | ffmpeg-84170d4be053a4c7901965fe1977970b5c5e85e5.tar.gz | |
lavc/mjpegdec: Detect more CMYK images.
Fixes ticket #4772.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mjpegdec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 899af4e6a6..039fe0edfb 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -345,6 +345,12 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) i, h_count[i], v_count[i], s->component_id[i], s->quant_index[i]); } + if ( nb_components == 4 + && s->component_id[0] == 'C' - 1 + && s->component_id[1] == 'M' - 1 + && s->component_id[2] == 'Y' - 1 + && s->component_id[3] == 'K' - 1) + s->adobe_transform = 0; if (s->ls && (s->h_max > 1 || s->v_max > 1)) { avpriv_report_missing_feature(s->avctx, "Subsampling in JPEG-LS"); |