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)
commit4531981a9b205317cdb42e57d7f2d8641a03118d
tree95d27533c19d342285846002d0db80ef2a27dea2
parentb8945c4e2a1b2484673e5b426e4d12abf6b006c7
parente2a3df1a464091075040a81ffc419fa21a8a5fd8
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@gmail.com>