diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 01:14:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 01:14:26 +0200 |
| commit | d56c373391d334d3dc29c752955fd17f0cef7ff9 (patch) | |
| tree | 473b7ab2b5474ca27557066087038d9bfee4ea15 /libavcodec/mjpegdec.c | |
| parent | 1f361124d97cf8b8ce6d3aacb10cdc53706470de (diff) | |
| download | ffmpeg-d56c373391d334d3dc29c752955fd17f0cef7ff9.tar.gz | |
avcodec/mjpegdec: fix cmyk 420 with adobe_transform == 2
Fixes Ticket3516
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 47017ef6ba..3c103953f9 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -414,6 +414,12 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) s->upscale_v = 6; s->upscale_h = 6; s->chroma_height = s->height; + } else if (s->adobe_transform == 2 && s->bits <= 8) { + s->avctx->pix_fmt = AV_PIX_FMT_YUVA444P; + s->upscale_v = 6; + s->upscale_h = 6; + s->chroma_height = s->height; + s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; } else { if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_YUVA420P; else s->avctx->pix_fmt = AV_PIX_FMT_YUVA420P16; @@ -2053,6 +2059,7 @@ the_end: avctx->pix_fmt == AV_PIX_FMT_YUV444P || avctx->pix_fmt == AV_PIX_FMT_YUVJ440P || avctx->pix_fmt == AV_PIX_FMT_YUV440P || + avctx->pix_fmt == AV_PIX_FMT_YUVA444P || avctx->pix_fmt == AV_PIX_FMT_GBRAP ); for (p = 1; p<4; p++) { @@ -2072,6 +2079,7 @@ the_end: avctx->pix_fmt == AV_PIX_FMT_YUV444P || avctx->pix_fmt == AV_PIX_FMT_YUVJ422P || avctx->pix_fmt == AV_PIX_FMT_YUV422P || + avctx->pix_fmt == AV_PIX_FMT_YUVA444P || avctx->pix_fmt == AV_PIX_FMT_GBRAP ); avcodec_get_chroma_sub_sample(s->avctx->pix_fmt, &hshift, &vshift); |