On Wed, 12 Mar 2014 15:30:43 +0100, Vittorio Giovara <[email protected]> wrote: > --- > libavcodec/mjpegdec.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c > index 8210fd3..b1192c5 100644 > --- a/libavcodec/mjpegdec.c > +++ b/libavcodec/mjpegdec.c > @@ -338,8 +338,10 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) > case 0x11111100: > if (s->rgb) > s->avctx->pix_fmt = AV_PIX_FMT_BGRA; > - else > + else { > s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV444P : > AV_PIX_FMT_YUVJ444P; > + s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : > AVCOL_RANGE_JPEG; > + } > assert(s->nb_components == 3); > break; > case 0x11000000: > @@ -347,12 +349,15 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) > break; > case 0x12111100: > s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV440P : > AV_PIX_FMT_YUVJ440P; > + s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : > AVCOL_RANGE_JPEG; > break; > case 0x21111100: > s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV422P : > AV_PIX_FMT_YUVJ422P; > + s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : > AVCOL_RANGE_JPEG; > break; > case 0x22111100: > s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV420P : > AV_PIX_FMT_YUVJ420P; > + s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : > AVCOL_RANGE_JPEG; > break; > default: > av_log(s->avctx, AV_LOG_ERROR, "Unhandled pixel format 0x%x\n", > pix_fmt_id); > -- > 1.8.3.4 (Apple Git-47) >
Fine with me -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
