Merge commit 'b9f7a677083647d85e583d6d7384938766a293d7'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 20:42:23 +0000 (22:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 20:42:56 +0000 (22:42 +0200)
* commit 'b9f7a677083647d85e583d6d7384938766a293d7':
  png: Set the color range as full range

Conflicts:
libavcodec/pngdec.c

See: 72e7553125e61847d9cab77fb7de62440dca746b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pngdec.c

index 72d75fb..2512799 100644 (file)
@@ -633,8 +633,6 @@ static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s,
             return AVERROR_INVALIDDATA;
         }
 
-        avctx->color_range = AVCOL_RANGE_JPEG;
-
         if ((ret = ff_thread_get_buffer(avctx, &s->picture, AV_GET_BUFFER_FLAG_REF)) < 0)
             return ret;
         ff_thread_finish_setup(avctx);
@@ -1245,6 +1243,8 @@ static av_cold int png_dec_init(AVCodecContext *avctx)
 {
     PNGDecContext *s = avctx->priv_data;
 
+    avctx->color_range = AVCOL_RANGE_JPEG;
+
     s->avctx = avctx;
     s->previous_picture.f = av_frame_alloc();
     s->last_picture.f = av_frame_alloc();