diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 14:08:51 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 14:08:51 +0200 |
commit | 4531981a9b205317cdb42e57d7f2d8641a03118d (patch) | |
tree | 95d27533c19d342285846002d0db80ef2a27dea2 /libavcodec/pnm_parser.c | |
parent | b8945c4e2a1b2484673e5b426e4d12abf6b006c7 (diff) | |
parent | e2a3df1a464091075040a81ffc419fa21a8a5fd8 (diff) | |
download | ffmpeg-4531981a9b205317cdb42e57d7f2d8641a03118d.tar.gz |
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>
Diffstat (limited to 'libavcodec/pnm_parser.c')
0 files changed, 0 insertions, 0 deletions