* commit '111367263af41c88a44bd763ceefc11d53a7f655': lavfi: add AVFilterContext.graph. Conflicts: libavfilter/avfilter.h
Showing the changes to libavfilter/avfiltergraph.c (1 of 3 files). Show all
Unified · Split
| @@ -88,6 +88,8 @@ int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter) · 87 unmodified lines | |||
| 88 | graph->filter_count_unused = graph->nb_filters; | 88 | graph->filter_count_unused = graph->nb_filters; |
| 89 | #endif | 89 | #endif |
| 90 | 90 | ||
| 91 | filter->graph = graph; | ||
| 92 | |||
| 91 | return 0; | 93 | return 0; |
| 92 | } | 94 | } |
| 93 | #endif | 95 | #endif |
| @@ -143,6 +145,8 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph, · 49 unmodified lines | |||
| 143 | graph->filter_count_unused = graph->nb_filters; | 145 | graph->filter_count_unused = graph->nb_filters; |
| 144 | #endif | 146 | #endif |
| 145 | 147 | ||
| 148 | s->graph = graph; | ||
| 149 | |||
| 146 | return s; | 150 | return s; |
| 147 | } | 151 | } |
| 148 | 152 | ||