diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:25:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:32:08 +0200 |
| commit | 314be1933e3a39abd6576184786703701ced4415 (patch) | |
| tree | 12d4b0da77869fe4adf9b7094bd0bf46908537ef /libavfilter | |
| parent | ab6091f8e21df7280f2b50fd6226bbc130fb060a (diff) | |
| parent | ac20e3ab8ed497549ee2a62754f01eee5e7a5066 (diff) | |
| download | ffmpeg-314be1933e3a39abd6576184786703701ced4415.tar.gz | |
Merge commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066'
* commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066':
af_amix: switch to an AVOptions-based system.
Conflicts:
libavfilter/af_amix.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_amix.c | 11 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 1 |
2 files changed, 3 insertions, 9 deletions
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index dcb24b0f3a..a1f6747c51 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -486,14 +486,7 @@ fail: static int init(AVFilterContext *ctx, const char *args) { MixContext *s = ctx->priv; - int i, ret; - - s->class = &amix_class; - av_opt_set_defaults(s); - - if ((ret = av_set_options_string(s, args, "=", ":")) < 0) - return ret; - av_opt_free(s); + int i; for (i = 0; i < s->nb_inputs; i++) { char name[32]; @@ -556,6 +549,7 @@ AVFilter avfilter_af_amix = { .name = "amix", .description = NULL_IF_CONFIG_SMALL("Audio mixing."), .priv_size = sizeof(MixContext), + .priv_class = &amix_class, .init = init, .uninit = uninit, @@ -563,5 +557,4 @@ AVFilter avfilter_af_amix = { .inputs = NULL, .outputs = avfilter_af_amix_outputs, - .priv_class = &amix_class, }; diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 8fe2389c80..497a867801 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -657,6 +657,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque int ret=0; int anton_options = !strcmp(filter->filter->name, "aformat") || + !strcmp(filter->filter->name, "amix" ) || !strcmp(filter->filter->name, "ass") || !strcmp(filter->filter->name, "blackframe") || !strcmp(filter->filter->name, "boxblur" ) || |