summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-11-01 16:50:18 +0100
committerwm4 <wm4@nowhere>2017-11-01 16:50:18 +0100
commita7a1ae0b3d60cdaab0774fcb08de33fa6b12848b (patch)
tree1041734ff347247d7a2341465c093cce32fe62f8 /common
parent501230f2a014887ce38e0d3a73bb432166f611f1 (diff)
downloadmpv-a7a1ae0b3d60cdaab0774fcb08de33fa6b12848b.tar.bz2
mpv-a7a1ae0b3d60cdaab0774fcb08de33fa6b12848b.tar.xz
build: make it easier to force FFmpeg upstream
Apparently some people want this. Actually making it compile is still their problem, though, and I expect that build with FFmpeg upstream will occasionally be broken (as it is right now). This is because mpv also relies on API provided by Libav, and if FFmpeg hasn't merged that yet, it's not our problem - we provide a version of FFmpeg upstream with those changes merged, and it's called ffmpeg-mpv. Also adjust the README which still talked about FFmpeg releases.
Diffstat (limited to 'common')
-rw-r--r--common/av_log.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/common/av_log.c b/common/av_log.c
index e5f54844cf..468e50502e 100644
--- a/common/av_log.c
+++ b/common/av_log.c
@@ -44,8 +44,7 @@
#if HAVE_LIBAV
#include <libavresample/avresample.h>
-#endif
-#if HAVE_FFMPEG_MPV
+#else
#include <libswresample/swresample.h>
#endif
@@ -199,8 +198,7 @@ bool print_libav_versions(struct mp_log *log, int v)
{"libavfilter", LIBAVFILTER_VERSION_INT, avfilter_version()},
#if HAVE_LIBAV
{"libavresample", LIBAVRESAMPLE_VERSION_INT, avresample_version()},
-#endif
-#if HAVE_FFMPEG_MPV
+#else
{"libswresample", LIBSWRESAMPLE_VERSION_INT, swresample_version()},
#endif
};