diff options
| author | wm4 <wm4@nowhere> | 2017-10-30 20:55:42 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-10-30 20:55:42 +0100 |
| commit | a7f4ecb01299835a1afe5cc051be1e9bb5d4f15d (patch) | |
| tree | 47018827973ad72e5470298349a28bfd50e23a40 /common | |
| parent | 1c46bd5e5048a2ba587ed2ff74f416f365624df9 (diff) | |
| download | mpv-a7f4ecb01299835a1afe5cc051be1e9bb5d4f15d.tar.bz2 mpv-a7f4ecb01299835a1afe5cc051be1e9bb5d4f15d.tar.xz | |
Bump libav* API use
(Not tested on Windows and OSX.)
Diffstat (limited to 'common')
| -rw-r--r-- | common/av_log.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/av_log.c b/common/av_log.c index 8e5502b317..e5f54844cf 100644 --- a/common/av_log.c +++ b/common/av_log.c @@ -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 }; |