From ef7e8425e839d50d0d99958e027db0c1f5021a1d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 1 Jul 2014 23:28:18 +0200 Subject: avcodec/mjpegdec: factorize some parts of the pix_fmt_id switch() Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 2e26223cb4..1a774ddc61 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -453,12 +453,6 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) break; case 0x12121100: case 0x22122100: - 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->chroma_height = s->height; - break; case 0x21211100: case 0x22211200: if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P; @@ -469,12 +463,6 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) 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->chroma_height = s->height / 2; - break; case 0x11222200: if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV444P : AV_PIX_FMT_YUVJ444P; else -- cgit v1.2.3