diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 18:28:13 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 18:31:01 +0200 |
| commit | c74b0eda34f187cc879361f93bd1d8cd7a1c54e6 (patch) | |
| tree | 64ee0e15ab96343d20299666ee8f40e6512a992c | |
| parent | eabc0c733dee807d721d4c8a7acb7dd05684ef89 (diff) | |
| download | ffmpeg-c74b0eda34f187cc879361f93bd1d8cd7a1c54e6.tar.gz | |
lavfi/amerge: switch to an AVOptions-based system.
| -rw-r--r-- | doc/filters.texi | 2 | ||||
| -rw-r--r-- | libavfilter/af_amerge.c | 9 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 1 |
3 files changed, 2 insertions, 10 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index d6b9ca1112..097d3bce4c 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -759,7 +759,7 @@ aformat=sample_fmts=u8|s16:channel_layouts=stereo Merge two or more audio streams into a single multi-channel stream. -The filter accepts the following named options: +The filter accepts the following options: @table @option diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 4a7b0b724c..1d3792d7a8 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -306,15 +306,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) static av_cold int init(AVFilterContext *ctx, const char *args) { AMergeContext *am = ctx->priv; - int ret, i; + int i; - am->class = &amerge_class; - av_opt_set_defaults(am); - ret = av_set_options_string(am, args, "=", ":"); - if (ret < 0) { - av_log(ctx, AV_LOG_ERROR, "Error parsing options: '%s'\n", args); - return ret; - } am->in = av_calloc(am->nb_inputs, sizeof(*am->in)); if (!am->in) return AVERROR(ENOMEM); diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 334598ddc7..64d9e933ea 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -674,7 +674,6 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options, static const char *const filters_left_to_update[] = { "abuffer", "aconvert", - "amerge", "aresample", "atempo", "buffer", |