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 /libavfilter/avfiltergraph.c | |
| parent | 5c68e14e42c181f03d956465c557b7b890fd1983 (diff) | |
| parent | 111367263af41c88a44bd763ceefc11d53a7f655 (diff) | |
Merge commit '111367263af41c88a44bd763ceefc11d53a7f655'
* commit '111367263af41c88a44bd763ceefc11d53a7f655':
lavfi: add AVFilterContext.graph.
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfiltergraph.c')
| -rw-r--r-- | libavfilter/avfiltergraph.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; } |