aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/pngdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-10 22:42:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-10 22:42:56 +0200
commitf230451b7a6949af297259de78a480166d43fddd (patch)
tree3dad718cf0f6e4721fa5986c8a763fb6c61abefd /libavcodec/pngdec.c
parent55231323b0fdc84a529418d673148cf1f3157229 (diff)
parentb9f7a677083647d85e583d6d7384938766a293d7 (diff)
downloadffmpeg-f230451b7a6949af297259de78a480166d43fddd.tar.gz
Merge commit 'b9f7a677083647d85e583d6d7384938766a293d7'
* commit 'b9f7a677083647d85e583d6d7384938766a293d7': png: Set the color range as full range Conflicts: libavcodec/pngdec.c See: 72e7553125e61847d9cab77fb7de62440dca746b Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pngdec.c')
-rw-r--r--libavcodec/pngdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 72d75fba80..251279968b 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -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();