Merge commit '147f2e91eece6b9021ff5b7f8a3b5ce053566659'

* commit '147f2e91eece6b9021ff5b7f8a3b5ce053566659': avcodec: make sure color_range is properly initialized Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 10dd62737e
parent d5a3caef93 147f2e91ee
commit 10dd62737e
1 changed files with 5 additions and 0 deletions
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@ -1530,6 +1530,11 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
                ret = AVERROR(EINVAL);
                goto free_and_end;
            }
+            if (avctx->codec->pix_fmts[i] == AV_PIX_FMT_YUVJ420P ||
+                avctx->codec->pix_fmts[i] == AV_PIX_FMT_YUVJ422P ||
+                avctx->codec->pix_fmts[i] == AV_PIX_FMT_YUVJ440P ||
+                avctx->codec->pix_fmts[i] == AV_PIX_FMT_YUVJ444P)
+                avctx->color_range = AVCOL_RANGE_JPEG;
        }
        if (avctx->codec->supported_samplerates) {
            for (i = 0; avctx->codec->supported_samplerates[i] != 0; i++)