Merge commit 'e2a3df1a464091075040a81ffc419fa21a8a5fd8'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:08:51 +0000 (14:08 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:08:51 +0000 (14:08 +0200)
* commit 'e2a3df1a464091075040a81ffc419fa21a8a5fd8':
  avconv: Use more precise deprecation ifdefs

The PSNR functionality is not deprecated in ffmpeg.

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

Trivial merge