eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '111367263af41c88a44bd763ceefc11d53a7f655'

Browse Source 
* commit '111367263af41c88a44bd763ceefc11d53a7f655':
  lavfi: add AVFilterContext.graph.

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-04-12 00:44:18 +02:00
parent 5c68e14e42 111367263a
commit 4fde705396
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavfilter/avfiltergraph.c
+4
View File
@@ -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;
}