avcodec/mjpegdec: factorize some parts of the pix_fmt_id switch()
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 21:28:18 +0000 (23:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 21:28:18 +0000 (23:28 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegdec.c

index 2e26223cb4e1e60ead327f92b191cb5df05aa5a9..1a774ddc615536a7b8d26d4f1788cadb3dd498e2 100644 (file)
@@ -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