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.
This commit is contained in:
wm4
2017-11-01 16:50:18 +01:00
parent 501230f2a0
commit a7a1ae0b3d
4 changed files with 17 additions and 21 deletions

View File

@@ -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
};