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/internal.h | |
| parent | 4fde705396759ad96a662a400d5f1667c19c614b (diff) | |
| parent | 1565cbc65cbb9f95c11367314a080068895e0cf0 (diff) | |
| download | ffmpeg-eb0f774d4bfdb1e5cb131f63580417cfb6b47514.tar.gz | |
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/internal.h')
| -rw-r--r-- | libavfilter/internal.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 6907b76a71..fbe935667f 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -349,4 +349,9 @@ enum { */ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name); +/** + * Remove a filter from a graph; + */ +void ff_filter_graph_remove_filter(AVFilterGraph *graph, AVFilterContext *filter); + #endif /* AVFILTER_INTERNAL_H */ |