RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mjpegdec: Support pix_fmt_id == 0x22112200 

Fixes 4780490_300.jpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-01 21:47:09 +02:00
parent 141ee10913
commit 4e09300ffa
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mjpegdec.c
View File

@ -456,12 +456,13 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
s->chroma_height = s->height;
break;
case 0x22221100:
case 0x22112200:
if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P;
else
goto unk_pixfmt;
s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG;
s->upscale_v = 4;
s->upscale_h = 4;
s->upscale_v = 2<<(pix_fmt_id == 0x22221100);
s->upscale_h = 2<<(pix_fmt_id == 0x22221100);
s->chroma_height = s->height / 2;
break;
case 0x11000000: