[FFmpeg-cvslog] Merge commit 'b9f7a677083647d85e583d6d7384938766a293d7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 10 22:42:23 2015 +0200| [f230451b7a6949af297259de78a480166d43fddd] | committer: Michael Niedermayer

Merge commit 'b9f7a677083647d85e583d6d7384938766a293d7'

* commit 'b9f7a677083647d85e583d6d7384938766a293d7':
  png: Set the color range as full range

Conflicts:
	libavcodec/pngdec.c

See: 72e7553125e61847d9cab77fb7de62440dca746b
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f230451b7a6949af297259de78a480166d43fddd
---