diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-22 19:18:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-22 19:38:43 +0100 |
| commit | 2f6550bb9a8d71f56fefbdbf849f17de22b57e66 (patch) | |
| tree | 21f217deb8e4375caf05ed89a73a8dac2b8a5df8 /libavcodec/mjpegdec.c | |
| parent | 8437cc72060f3fb057b96a908b33e9954074bac7 (diff) | |
| download | ffmpeg-2f6550bb9a8d71f56fefbdbf849f17de22b57e66.tar.gz | |
avcodec/mjpegdec: fix pixfmtid 0x14111100
Fixes part of Ticket 2004
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index c4d4d8bce7..27344bd891 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -490,6 +490,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) break; case 0x12111100: case 0x14121200: + case 0x14111100: case 0x22211100: case 0x22112100: if (s->component_id[0] == 'Q' && s->component_id[1] == 'F' && s->component_id[2] == 'A') { @@ -498,6 +499,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) goto unk_pixfmt; s->upscale_v |= 3; } else { + if (pix_fmt_id == 0x14111100) + s->upscale_v |= 6; if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV440P : AV_PIX_FMT_YUVJ440P; else goto unk_pixfmt; @@ -2146,6 +2149,8 @@ the_end: avctx->pix_fmt == AV_PIX_FMT_YUV422P || avctx->pix_fmt == AV_PIX_FMT_YUVJ420P || avctx->pix_fmt == AV_PIX_FMT_YUV420P || + avctx->pix_fmt == AV_PIX_FMT_YUV440P || + avctx->pix_fmt == AV_PIX_FMT_YUVJ440P || avctx->pix_fmt == AV_PIX_FMT_YUVA444P || avctx->pix_fmt == AV_PIX_FMT_GBRP || avctx->pix_fmt == AV_PIX_FMT_GBRAP |