[FFmpeg-cvslog] Merge commit 'd10d1b86550d254bd1e746ed613bf6885978879c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct  1 21:23:42 2014 +0200| [5dd4e644f3f3608016885d0023d74c832119fd5b] | committer: Michael Niedermayer

Merge commit 'd10d1b86550d254bd1e746ed613bf6885978879c'

* commit 'd10d1b86550d254bd1e746ed613bf6885978879c':
  libx265: enable psnr reporting when requested by the user

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

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