Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

mjpegdec: Support pix_fmt_id == 0x22112200

Browse Source 
Fixes 4780490_300.jpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/76/merge
Michael Niedermayer 11 years ago
parent 141ee10913
commit 4e09300ffa
1 changed files with 3 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      libavcodec/mjpegdec.c

5
libavcodec/mjpegdec.c
Unescape View File

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

Write Preview
Loading…
Cancel
Save