diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 00:39:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 00:39:09 +0200 |
| commit | 5c68e14e42c181f03d956465c557b7b890fd1983 (patch) | |
| tree | c170cb5ddbb623e8ee7e299eb00020f9c5f200df | |
| parent | 86070b8e5a0e0ba087a9ce2a050c00094e29f35b (diff) | |
| parent | c2c9801bc9bce688d51d1a96f5f3ea93933e2dee (diff) | |
| download | ffmpeg-5c68e14e42c181f03d956465c557b7b890fd1983.tar.gz | |
Merge commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee'
* commit 'c2c9801bc9bce688d51d1a96f5f3ea93933e2dee':
lavfi: deprecate avfilter_graph_add_filter().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 6 | ||||
| -rw-r--r-- | libavfilter/avfiltergraph.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index d074d3c880..4f7652a647 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -159,7 +159,8 @@ API changes, most recent first: 2013-xx-xx - lavfi 3.8.0 Move all content from avfiltergraph.h to avfilter.h. Deprecate avfilterhraph.h, user applications should include just avfilter.h - Add avfilter_graph_alloc_filter(), deprecate avfilter_open(). + Add avfilter_graph_alloc_filter(), deprecate avfilter_open() and + avfilter_graph_add_filter(). 2013-xx-xx - lavfi 3.7.0 - avfilter.h Add AVFilter.priv_class for exporting filter options through the AVOptions API diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index dbdcf9d210..e09fd75930 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -978,13 +978,19 @@ 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. diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 771c7dfda6..4dca8643d9 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -73,6 +73,7 @@ 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, @@ -89,6 +90,7 @@ int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter) return 0; } +#endif int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt, const char *name, const char *args, void *opaque, |