From a7a1ae0b3d60cdaab0774fcb08de33fa6b12848b Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 1 Nov 2017 16:50:18 +0100 Subject: 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. --- audio/aconverter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'audio') diff --git a/audio/aconverter.c b/audio/aconverter.c index bae0ab7d19..a9025278cb 100644 --- a/audio/aconverter.c +++ b/audio/aconverter.c @@ -33,7 +33,7 @@ #include "fmt-conversion.h" #include "format.h" -#define HAVE_LIBSWRESAMPLE HAVE_FFMPEG_MPV +#define HAVE_LIBSWRESAMPLE (!HAVE_LIBAV) #define HAVE_LIBAVRESAMPLE HAVE_LIBAV #if HAVE_LIBAVRESAMPLE -- cgit v1.2.3