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.h | |
| 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.h')
| -rw-r--r-- | libavfilter/avfilter.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 2360b24f7f..711cf4b551 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -873,7 +873,8 @@ int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *in int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque); /** - * Free a filter context. + * Free a filter context. This will also remove the filter from its + * filtergraph's list of filters. * * @param filter the filter to free */ |