diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 00:54:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 00:54:05 +0200 |
| commit | eb0f774d4bfdb1e5cb131f63580417cfb6b47514 (patch) | |
| tree | 4b09152f83728967ff6bd1bd3a0d72213be4d26f /libavfilter/avfilter.c | |
| parent | 4fde705396759ad96a662a400d5f1667c19c614b (diff) | |
| parent | 1565cbc65cbb9f95c11367314a080068895e0cf0 (diff) | |
Merge commit '1565cbc65cbb9f95c11367314a080068895e0cf0'
* commit '1565cbc65cbb9f95c11367314a080068895e0cf0':
lavfi: make avfilter_free() remove the filter from its graph.
Conflicts:
libavfilter/avfilter.c
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 406537a5a6..54d90dcd02 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -571,6 +571,9 @@ void avfilter_free(AVFilterContext *filter) if (!filter) return; + if (filter->graph) + ff_filter_graph_remove_filter(filter->graph, filter); + if (filter->filter->uninit) filter->filter->uninit(filter); |