From d0cdce3646189775b3bd6f884669cad509201902 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 23 Sep 2018 10:19:58 +0200 Subject: Don’t use deprecated ffmpeg functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are now optional according to doc/APIchanges. Closes #670. --- src/config.h | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'src/config.h') diff --git a/src/config.h b/src/config.h index e6982db..bc8934a 100644 --- a/src/config.h +++ b/src/config.h @@ -12,10 +12,33 @@ * ffmpeg’s micro versions always start at 100, that’s how we can distinguish * ffmpeg and libav */ #include +#include /* does graph_send_command exist (ffmpeg >=2.2) */ -#if LIBAVFILTER_VERSION_MAJOR >= 4 && \ +#if !defined(HAVE_AVFILTER_GRAPH_SEND_COMMAND) && \ + LIBAVFILTER_VERSION_MAJOR >= 4 && \ LIBAVFILTER_VERSION_MICRO >= 100 #define HAVE_AVFILTER_GRAPH_SEND_COMMAND #endif +/* explicit init is optional for ffmpeg>=4.0 */ +#if !defined(HAVE_AVFORMAT_NETWORK_INIT) && \ + LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 5, 100) && \ + LIBAVFORMAT_VERSION_MICRO >= 100 +#define HAVE_AVFORMAT_NETWORK_INIT +#endif + +/* dito */ +#if !defined(HAVE_AVFILTER_REGISTER_ALL) && \ + LIBAVFILTER_VERSION_INT < AV_VERSION_INT(7, 14, 100) && \ + LIBAVFILTER_VERSION_MICRO >= 100 +#define HAVE_AVFILTER_REGISTER_ALL +#endif + +/* dito */ +#if !defined(HAVE_AV_REGISTER_ALL) && \ + LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100) && \ + LIBAVFORMAT_VERSION_MICRO >= 100 +#define HAVE_AV_REGISTER_ALL +#endif + -- cgit v1.2.3