diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 13:27:33 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 13:30:17 +0200 |
commit | 828044aca289f12356e1bdcda232430d8ed22e2d (patch) | |
tree | 89109e640f924cc01ea92b6879c752b3f9bb0257 /libavfilter/avfilter.h | |
parent | d2752ef0615d0ce9cdf6effed97cd4750ffde4a9 (diff) | |
parent | 4fa1f52e33b70029e2b621852f3af7c1ef9aecff (diff) |
Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'
* commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff':
af_resample: switch to an AVOptions-based system.
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.h')
-rw-r--r-- | libavfilter/avfilter.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 282d4dfb51..b19d652f86 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -452,6 +452,13 @@ typedef struct AVFilter { int (*init)(AVFilterContext *ctx, const char *args); /** + * Should be set instead of init by the filters that want to pass a + * dictionary of AVOptions to nested contexts that are allocated in + * init. + */ + int (*init_dict)(AVFilterContext *ctx, AVDictionary **options); + + /** * Filter uninitialization function. Should deallocate any memory held * by the filter, release any buffer references, etc. This does not need * to deallocate the AVFilterContext->priv memory itself. |