diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 00:44:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 00:44:18 +0200 |
| commit | 4fde705396759ad96a662a400d5f1667c19c614b (patch) | |
| tree | 4dfe04a9c1865a2e3ee11e78c606356054c762d5 | |
| parent | 5c68e14e42c181f03d956465c557b7b890fd1983 (diff) | |
| parent | 111367263af41c88a44bd763ceefc11d53a7f655 (diff) | |
| download | ffmpeg-4fde705396759ad96a662a400d5f1667c19c614b.tar.gz | |
Merge commit '111367263af41c88a44bd763ceefc11d53a7f655'
* commit '111367263af41c88a44bd763ceefc11d53a7f655':
lavfi: add AVFilterContext.graph.
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/APIchanges | 2 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 2 | ||||
| -rw-r--r-- | libavfilter/avfiltergraph.c | 4 |
3 files changed, 8 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 4f7652a647..8e6b4d1a6f 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -161,6 +161,8 @@ API changes, most recent first: avfilterhraph.h, user applications should include just avfilter.h Add avfilter_graph_alloc_filter(), deprecate avfilter_open() and avfilter_graph_add_filter(). + Add AVFilterContext.graph pointing to the AVFilterGraph that contains the + 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 e09fd75930..2360b24f7f 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -527,6 +527,8 @@ struct AVFilterContext { void *priv; ///< private data for use by the filter + struct AVFilterGraph *graph; ///< filtergraph this filter belongs to + struct AVFilterCommand *command_queue; }; diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 4dca8643d9..8dd543362f 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -88,6 +88,8 @@ int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter) graph->filter_count_unused = graph->nb_filters; #endif + filter->graph = graph; + return 0; } #endif @@ -143,6 +145,8 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph, graph->filter_count_unused = graph->nb_filters; #endif + s->graph = graph; + return s; } |