[FFmpeg-cvslog] Merge commit 'f29cf578923d2d4d2cf891dfc0c7ac45c641a5b7' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 13:11:18 2015 +0200| [48648f5168ec0f89a46dd10144139c71b5e46baf] | committer: Michael Niedermayer

Merge commit 'f29cf578923d2d4d2cf891dfc0c7ac45c641a5b7' into release/2.2

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

Conflicts:
	libavcodec/pngdec.c

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

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