virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

lavc/mjpegdec: Detect more CMYK images.

Browse Source 
Fixes ticket #4772.
This commit is contained in:
Carl Eugen Hoyos 2015-08-17 15:53:41 +02:00
parent 3afca32561
commit 84170d4be0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mjpegdec.c
View File

@ -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");