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)
commitf230451b7a6949af297259de78a480166d43fddd
tree3dad718cf0f6e4721fa5986c8a763fb6c61abefd
parent55231323b0fdc84a529418d673148cf1f3157229
parentb9f7a677083647d85e583d6d7384938766a293d7
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>
libavcodec/pngdec.c