From 0a64272db65201fc2ecb3406b89d895966933b99 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 2 Jun 2014 12:40:56 +0200 Subject: libav* autodetection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I’ll give it another shot. ffmpeg’s doc/developer.texi states their micro version always starts at 100 for this very reason. Use that to detect ffmpeg and guess its version by looking at major and minor version numbers. Let’s hope this works. --- src/player.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src/player.c') diff --git a/src/player.c b/src/player.c index b82a3aa..fba1d47 100644 --- a/src/player.c +++ b/src/player.c @@ -31,6 +31,26 @@ THE SOFTWARE. #include #include +/* ffmpeg/libav quirks + * ffmpeg’s micro versions always start at 100, that’s how we can distinguish + * ffmpeg and libav */ +#include +/* ffmpeg 2.2 */ +#if LIBAVFILTER_VERSION_MAJOR == 4 && \ + LIBAVFILTER_VERSION_MINOR <= 2 && \ + LIBAVFILTER_VERSION_MICRO >= 100 +#define HAVE_AVFILTER_GRAPH_SEND_COMMAND +#endif + +/* ffmpeg 1.2 */ +#if LIBAVFILTER_VERSION_MAJOR == 3 && \ + LIBAVFILTER_VERSION_MINOR <= 42 && \ + LIBAVFILTER_VERSION_MINOR > 32 && \ + LIBAVFILTER_VERSION_MICRO >= 100 +#define HAVE_AV_BUFFERSINK_GET_BUFFER_REF +#define HAVE_LIBAVFILTER_AVCODEC_H +#endif + #include #include #include -- cgit v1.2.3