[FFmpeg-cvslog] lavfi: Drop deprecated functions to open a filter or a filterchain
Vittorio Giovara
git at videolan.org
Sat Oct 21 21:33:28 EEST 2017
ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Dec 5 12:41:49 2016 -0500| [c5c7cfd5e80d4c36568c01cc40abfde341657ad9] | committer: Vittorio Giovara
lavfi: Drop deprecated functions to open a filter or a filterchain
Deprecated in 03/2013.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5c7cfd5e80d4c36568c01cc40abfde341657ad9
---
libavfilter/avfilter.c | 8 --------
libavfilter/avfilter.h | 30 ------------------------------
libavfilter/avfiltergraph.c | 17 -----------------
libavfilter/version.h | 3 ---
4 files changed, 58 deletions(-)
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index d9c204e766..d6bddef4a0 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -475,14 +475,6 @@ err:
return NULL;
}
-#if FF_API_AVFILTER_OPEN
-int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name)
-{
- *filter_ctx = ff_filter_alloc(filter, inst_name);
- return *filter_ctx ? 0 : AVERROR(ENOMEM);
-}
-#endif
-
static void free_link(AVFilterLink *link)
{
if (!link)
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 568480dd3e..babcec66f2 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -479,22 +479,6 @@ attribute_deprecated
AVFilter **av_filter_next(AVFilter **filter);
#endif
-#if FF_API_AVFILTER_OPEN
-/**
- * Create a filter instance.
- *
- * @param filter_ctx put here a pointer to the created filter context
- * on success, NULL on failure
- * @param filter the filter to create an instance of
- * @param inst_name Name to give to the new instance. Can be NULL for none.
- * @return >= 0 in case of success, a negative error code otherwise
- * @deprecated use avfilter_graph_alloc_filter() instead
- */
-attribute_deprecated
-int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name);
-#endif
-
-
#if FF_API_AVFILTER_INIT_FILTER
/**
* Initialize a filter.
@@ -691,20 +675,6 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph,
*/
AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name);
-#if FF_API_AVFILTER_OPEN
-/**
- * Add an existing filter instance to a filter graph.
- *
- * @param graphctx the filter graph
- * @param filter the filter to be added
- *
- * @deprecated use avfilter_graph_alloc_filter() to allocate a filter in a
- * filter graph
- */
-attribute_deprecated
-int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
-#endif
-
/**
* Create and add a filter instance into an existing graph.
* The filter instance is created from the filter filt and inited
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 5053e3c37a..58ede68a31 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -116,23 +116,6 @@ void avfilter_graph_free(AVFilterGraph **graph)
av_freep(graph);
}
-#if FF_API_AVFILTER_OPEN
-int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
-{
- AVFilterContext **filters = av_realloc(graph->filters,
- sizeof(*filters) * (graph->nb_filters + 1));
- if (!filters)
- return AVERROR(ENOMEM);
-
- graph->filters = filters;
- graph->filters[graph->nb_filters++] = filter;
-
- filter->graph = graph;
-
- return 0;
-}
-#endif
-
int avfilter_graph_create_filter(AVFilterContext **filt_ctx, const AVFilter *filt,
const char *name, const char *args, void *opaque,
AVFilterGraph *graph_ctx)
diff --git a/libavfilter/version.h b/libavfilter/version.h
index bb437efa02..540ac48f9b 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -49,9 +49,6 @@
* the public API and may change, break or disappear at any time.
*/
-#ifndef FF_API_AVFILTER_OPEN
-#define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 7)
-#endif
#ifndef FF_API_AVFILTER_INIT_FILTER
#define FF_API_AVFILTER_INIT_FILTER (LIBAVFILTER_VERSION_MAJOR < 7)
#endif
More information about the ffmpeg-cvslog
mailing list