Merge commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24'

* commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24': ljpeg: check color_range Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 34e325efa5
parent 987b873049 bf0d7da7cb
commit 34e325efa5
1 changed files with 2 additions and 1 deletions
--- a/libavcodec/ljpegenc.c
+++ b/libavcodec/ljpegenc.c
@ -275,7 +275,8 @@ static av_cold int ljpeg_encode_init(AVCodecContext *avctx)

    if ((avctx->pix_fmt == AV_PIX_FMT_YUV420P ||
         avctx->pix_fmt == AV_PIX_FMT_YUV422P ||
-         avctx->pix_fmt == AV_PIX_FMT_YUV444P) &&
+         avctx->pix_fmt == AV_PIX_FMT_YUV444P ||
+         avctx->color_range == AVCOL_RANGE_MPEG) &&
        avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) {
        av_log(avctx, AV_LOG_ERROR,
               "Limited range YUV is non-standard, set strict_std_compliance to "