|
|
|
@ -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 |
|
|
|
|