diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 21:39:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 21:54:04 +0200 |
| commit | 1ab5f63941fda78d4af256cc2529df9460b36c1a (patch) | |
| tree | a93a35a3d7173520d35326fc10d5659ad06a8e18 | |
| parent | 9005075f397bc7bd2fa2e193f62cbf971bdaa4d4 (diff) | |
| parent | 0f50c53cfb959162f2bccc1a2c2e066d35723595 (diff) | |
| download | ffmpeg-1ab5f63941fda78d4af256cc2529df9460b36c1a.tar.gz | |
Merge commit '0f50c53cfb959162f2bccc1a2c2e066d35723595' into release/2.4
* commit '0f50c53cfb959162f2bccc1a2c2e066d35723595':
png: Set the color range as full range
Conflicts:
libavcodec/pngdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/pngdec.c | 1 | ||||
| -rw-r--r-- | tests/ref/fate/png-ya16 | 2 | ||||
| -rw-r--r-- | tests/ref/fate/png-ya8 | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index fa7b71355a..c2f417e169 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -918,6 +918,7 @@ static av_cold int png_dec_init(AVCodecContext *avctx) { PNGDecContext *s = avctx->priv_data; + avctx->color_range = AVCOL_RANGE_JPEG; s->avctx = avctx; s->last_picture.f = av_frame_alloc(); s->picture.f = av_frame_alloc(); diff --git a/tests/ref/fate/png-ya16 b/tests/ref/fate/png-ya16 index 07906c4a70..dffdaf7038 100644 --- a/tests/ref/fate/png-ya16 +++ b/tests/ref/fate/png-ya16 @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 49152, 0x93ce1cd5 +0, 0, 0, 1, 49152, 0x0801ce78 diff --git a/tests/ref/fate/png-ya8 b/tests/ref/fate/png-ya8 index 3a5c99d9eb..1318af80c6 100644 --- a/tests/ref/fate/png-ya8 +++ b/tests/ref/fate/png-ya8 @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 49152, 0xed73bf03 +0, 0, 0, 1, 49152, 0x5a1481f8 |