Bump libav* API use

(Not tested on Windows and OSX.)
This commit is contained in:
wm4
2017-10-30 20:55:42 +01:00
parent 1c46bd5e50
commit a7f4ecb012
7 changed files with 50 additions and 280 deletions

View File

@@ -42,10 +42,10 @@
#include <libavdevice/avdevice.h>
#endif
#if HAVE_IS_LIBAV
#if HAVE_LIBAV
#include <libavresample/avresample.h>
#endif
#if HAVE_IS_FFMPEG
#if HAVE_FFMPEG_MPV
#include <libswresample/swresample.h>
#endif
@@ -197,10 +197,10 @@ bool print_libav_versions(struct mp_log *log, int v)
{"libavformat", LIBAVFORMAT_VERSION_INT, avformat_version()},
{"libswscale", LIBSWSCALE_VERSION_INT, swscale_version()},
{"libavfilter", LIBAVFILTER_VERSION_INT, avfilter_version()},
#if HAVE_IS_LIBAV
#if HAVE_LIBAV
{"libavresample", LIBAVRESAMPLE_VERSION_INT, avresample_version()},
#endif
#if HAVE_IS_FFMPEG
#if HAVE_FFMPEG_MPV
{"libswresample", LIBSWRESAMPLE_VERSION_INT, swresample_version()},
#endif
};