RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2015-05-19 21:39:24 +02:00
parent 9005075f39 0f50c53cfb
commit 1ab5f63941
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/pngdec.c
View File

@ -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();

2
tests/ref/fate/png-ya16
View File

@ -1,2 +1,2 @@
#tb 0: 1/25
0, 0, 0, 1, 49152, 0x93ce1cd5
0, 0, 0, 1, 49152, 0x0801ce78

2
tests/ref/fate/png-ya8
View File

@ -1,2 +1,2 @@
#tb 0: 1/25
0, 0, 0, 1, 49152, 0xed73bf03
0, 0, 0, 1, 49152, 0x5a1481f8