diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-22 11:06:04 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-22 11:06:04 +0200 |
| commit | e6247a22c0238a73024f29bcced8ae828fe3b39a (patch) | |
| tree | 28cd7ac186ac8d5c0bfbf73e5a937072ea258b3e /ffprobe.c | |
| parent | df3484f87c4ddec548676a9eb38e6fc69aaceea6 (diff) | |
| parent | 763d69bfb2f0094e99f43e657cfd2b0471361f6b (diff) | |
| download | ffmpeg-e6247a22c0238a73024f29bcced8ae828fe3b39a.tar.gz | |
Merge commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b'
* commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b':
Add some more deprecation guards
- psnr() deprecation is not merged within ffmpeg.c as we still use it in
non-deprecated code
- the XVMC chunk is not merged as we still apparently maintain it
- The guarding in lavc/qtrleenc.c could be simplified but merged anyway.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions