[FFmpeg-cvslog] Merge commit 'e2a3df1a464091075040a81ffc419fa21a8a5fd8'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Jun 26 14:08:51 2016 +0200| [4531981a9b205317cdb42e57d7f2d8641a03118d] | committer: Hendrik Leppkes

Merge commit 'e2a3df1a464091075040a81ffc419fa21a8a5fd8'

* commit 'e2a3df1a464091075040a81ffc419fa21a8a5fd8':
  avconv: Use more precise deprecation ifdefs

The PSNR functionality is not deprecated in ffmpeg.

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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