From a7f4ecb01299835a1afe5cc051be1e9bb5d4f15d Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 30 Oct 2017 20:55:42 +0100
Subject: Bump libav* API use

(Not tested on Windows and OSX.)
---
 common/av_log.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'common')

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
     };
-- 
cgit v1.2.3