diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 21:47:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 21:47:54 +0200 |
| commit | 4e09300ffab76d2ee9689be8bc3d2d5ad1afb1c2 (patch) | |
| tree | c1d5336241483bd2baa0aabc7b1096a55b173bd0 /libavcodec | |
| parent | 141ee109132a2e79adf4b9067a3bef2d061967b1 (diff) | |
mjpegdec: Support pix_fmt_id == 0x22112200
Fixes 4780490_300.jpg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mjpegdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 76a338f4c4..bcdfad7cac 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -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: |