diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-07 15:37:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-07 15:37:11 +0100 |
| commit | 960c573cc549455038e7e4878f5dc762822fa8aa (patch) | |
| tree | 2fa86fe125caa80194deff76b341be12d2991822 /libavcodec/mjpegdec.c | |
| parent | ddac3053cd28788581d6944ca64c67cfe414a577 (diff) | |
avcodec/mjpegdec: support pix fmt id 0x22111111
Fixes: 4163724_300.jpg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index e3f6910925..b350f4473d 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -440,14 +440,15 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) av_assert0(s->nb_components == 4); break; case 0x22111122: + case 0x22111111: if (s->adobe_transform == 0 && s->bits <= 8) { s->avctx->pix_fmt = AV_PIX_FMT_GBRAP; - s->upscale_v = 6; - s->upscale_h = 6; + s->upscale_v |= 6; + s->upscale_h |= 6; } 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->upscale_v |= 6; + s->upscale_h |= 6; 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; |