diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 18:34:17 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 18:35:09 +0200 |
| commit | 3433228795744a31e0f583ab6bb060d027273cff (patch) | |
| tree | 07747e5923ffbbb01f8179696f8ceddcbec336d5 | |
| parent | c43bd08f8b043df7e18110e5344283c37b8380c1 (diff) | |
| download | ffmpeg-3433228795744a31e0f583ab6bb060d027273cff.tar.gz | |
lavfi: remove old graph parser API with different semantics
This API hasn't been active since the last bump already.
| -rw-r--r-- | libavfilter/avfilter.h | 21 | ||||
| -rw-r--r-- | libavfilter/graphparser.c | 8 | ||||
| -rw-r--r-- | libavfilter/version.h | 3 |
3 files changed, 0 insertions, 32 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index ce97eac90c..642aa834ab 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -937,7 +937,6 @@ AVFilterInOut *avfilter_inout_alloc(void); */ void avfilter_inout_free(AVFilterInOut **inout); -#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI || !FF_API_OLD_GRAPH_PARSE /** * Add a graph described by a string to a graph. * @@ -959,26 +958,6 @@ void avfilter_inout_free(AVFilterInOut **inout); int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, AVFilterInOut *inputs, AVFilterInOut *outputs, void *log_ctx); -#else -/** - * Add a graph described by a string to a graph. - * - * @param graph the filter graph where to link the parsed graph context - * @param filters string to be parsed - * @param inputs pointer to a linked list to the inputs of the graph, may be NULL. - * If non-NULL, *inputs is updated to contain the list of open inputs - * after the parsing, should be freed with avfilter_inout_free(). - * @param outputs pointer to a linked list to the outputs of the graph, may be NULL. - * If non-NULL, *outputs is updated to contain the list of open outputs - * after the parsing, should be freed with avfilter_inout_free(). - * @return non negative on success, a negative AVERROR code on error - * @deprecated Use avfilter_graph_parse_ptr() instead. - */ -attribute_deprecated -int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, - AVFilterInOut **inputs, AVFilterInOut **outputs, - void *log_ctx); -#endif /** * Add a graph described by a string to a graph. diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index 9e6fe6abdc..d9f40d698d 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -456,7 +456,6 @@ int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters, return ret; } -#if HAVE_INCOMPATIBLE_LIBAV_ABI || !FF_API_OLD_GRAPH_PARSE int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, AVFilterInOut *open_inputs, AVFilterInOut *open_outputs, void *log_ctx) @@ -518,13 +517,6 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, avfilter_inout_free(&open_inputs); avfilter_inout_free(&open_outputs); return ret; -#else -int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, - AVFilterInOut **inputs, AVFilterInOut **outputs, - void *log_ctx) -{ - return avfilter_graph_parse_ptr(graph, filters, inputs, outputs, log_ctx); -#endif } int avfilter_graph_parse_ptr(AVFilterGraph *graph, const char *filters, diff --git a/libavfilter/version.h b/libavfilter/version.h index 323d0fde36..d87548e173 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -64,9 +64,6 @@ #ifndef FF_API_OLD_FILTER_REGISTER #define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 7) #endif -#ifndef FF_API_OLD_GRAPH_PARSE -#define FF_API_OLD_GRAPH_PARSE (LIBAVFILTER_VERSION_MAJOR < 5) -#endif #ifndef FF_API_NOCONST_GET_NAME #define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7) #endif |