Merge commit 'd10d1b86550d254bd1e746ed613bf6885978879c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Oct 2014 19:23:42 +0000 (21:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Oct 2014 19:24:01 +0000 (21:24 +0200)
* commit 'd10d1b86550d254bd1e746ed613bf6885978879c':
  libx265: enable psnr reporting when requested by the user

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

Trivial merge