mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
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