mirror of https://git.ffmpeg.org/ffmpeg.git
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>
This commit is contained in:
commit
4531981a9b