From 6afed2aec129f42027d2ec3167c34f7b9d4e1fd6 Mon Sep 17 00:00:00 2001 From: Matthieu Bouron Date: Thu, 11 Apr 2013 01:06:16 +0200 Subject: [PATCH 1/4] lavfi/blend: switch to AVOption-based system --- doc/filters.texi | 3 +-- libavfilter/avfilter.c | 1 + libavfilter/vf_blend.c | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 5f85ac006a..a85b0f887f 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1904,8 +1904,7 @@ It takes two input streams and outputs one stream, the first input is the "top" layer and second input is "bottom" layer. Output terminates when shortest input terminates. -This filter accepts a list of options in the form of @var{key}=@var{value} -pairs separated by ":". A description of the accepted options follows. +A description of the accepted options follows. @table @option @item c0_mode diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 8fe2389c80..dd4addfb6f 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -659,6 +659,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "aformat") || !strcmp(filter->filter->name, "ass") || !strcmp(filter->filter->name, "blackframe") || + !strcmp(filter->filter->name, "blend" ) || !strcmp(filter->filter->name, "boxblur" ) || !strcmp(filter->filter->name, "cellauto") || !strcmp(filter->filter->name, "colormatrix") || diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 434b470561..d279e3a836 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -453,8 +453,6 @@ static const AVFilterPad blend_outputs[] = { { NULL } }; -static const char *const shorthand[] = { NULL }; - AVFilter avfilter_vf_blend = { .name = "blend", .description = NULL_IF_CONFIG_SMALL("Blend two video frames into each other."), @@ -465,5 +463,4 @@ AVFilter avfilter_vf_blend = { .inputs = blend_inputs, .outputs = blend_outputs, .priv_class = &blend_class, - .shorthand = shorthand, }; From 2b17e58163270466a48f1d58bdaecc8e93dffa01 Mon Sep 17 00:00:00 2001 From: Matthieu Bouron Date: Thu, 11 Apr 2013 01:22:53 +0200 Subject: [PATCH 2/4] lavfi/afade: switch to AVOption-base system --- doc/filters.texi | 3 --- libavfilter/af_afade.c | 3 --- libavfilter/avfilter.c | 1 + 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index a85b0f887f..f43415be4b 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -610,9 +610,6 @@ Beware of clipping when using a positive gain. Apply fade-in/out effect to input audio. -The filter accepts parameters as a list of @var{key}=@var{value} -pairs, separated by ":". - A description of the accepted parameters follows. @table @option diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c index 2ab467489e..a00d0e4da6 100644 --- a/libavfilter/af_afade.c +++ b/libavfilter/af_afade.c @@ -288,8 +288,6 @@ static const AVFilterPad avfilter_af_afade_outputs[] = { { NULL } }; -static const char *const shorthand[] = { NULL }; - AVFilter avfilter_af_afade = { .name = "afade", .description = NULL_IF_CONFIG_SMALL("Fade in/out input audio."), @@ -299,5 +297,4 @@ AVFilter avfilter_af_afade = { .inputs = avfilter_af_afade_inputs, .outputs = avfilter_af_afade_outputs, .priv_class = &afade_class, - .shorthand = shorthand, }; diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index dd4addfb6f..ff5b1fb899 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -656,6 +656,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque AVDictionaryEntry *e; int ret=0; int anton_options = + !strcmp(filter->filter->name, "afade" ) || !strcmp(filter->filter->name, "aformat") || !strcmp(filter->filter->name, "ass") || !strcmp(filter->filter->name, "blackframe") || From a5ce5ac9fb49f156c30524c466cd8a990d3830f1 Mon Sep 17 00:00:00 2001 From: Matthieu Bouron Date: Thu, 11 Apr 2013 01:31:08 +0200 Subject: [PATCH 3/4] lavfi/apad: switch to AVOption-based system --- libavfilter/af_apad.c | 3 --- libavfilter/avfilter.c | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libavfilter/af_apad.c b/libavfilter/af_apad.c index 3c972e9d40..8c8690ee7c 100644 --- a/libavfilter/af_apad.c +++ b/libavfilter/af_apad.c @@ -144,8 +144,6 @@ static const AVFilterPad apad_outputs[] = { { NULL }, }; -static const char *const shorthand[] = { NULL }; - AVFilter avfilter_af_apad = { .name = "apad", .description = NULL_IF_CONFIG_SMALL("Pad audio with silence."), @@ -154,5 +152,4 @@ AVFilter avfilter_af_apad = { .inputs = apad_inputs, .outputs = apad_outputs, .priv_class = &apad_class, - .shorthand = shorthand, }; diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index ff5b1fb899..0b4fcb3e57 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -658,6 +658,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque int anton_options = !strcmp(filter->filter->name, "afade" ) || !strcmp(filter->filter->name, "aformat") || + !strcmp(filter->filter->name, "apad" ) || !strcmp(filter->filter->name, "ass") || !strcmp(filter->filter->name, "blackframe") || !strcmp(filter->filter->name, "blend" ) || From f43da3def7645b99d67846fa6d6175b4ece3e9e4 Mon Sep 17 00:00:00 2001 From: Matthieu Bouron Date: Thu, 11 Apr 2013 01:37:57 +0200 Subject: [PATCH 4/4] lavfi/aphaser: switch to AVOption-based system --- doc/filters.texi | 3 --- libavfilter/af_aphaser.c | 3 --- libavfilter/avfilter.c | 1 + 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index f43415be4b..2669804efb 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -6343,9 +6343,6 @@ Add a phasing effect to the input audio. A phaser filter creates series of peaks and troughs in the frequency spectrum. The position of the peaks and troughs are modulated so that they vary over time, creating a sweeping effect. -The filter accepts parameters as a list of @var{key}=@var{value} -pairs, separated by ":". - A description of the accepted parameters follows. @table @option diff --git a/libavfilter/af_aphaser.c b/libavfilter/af_aphaser.c index 141278fa20..d61715dd7e 100644 --- a/libavfilter/af_aphaser.c +++ b/libavfilter/af_aphaser.c @@ -344,8 +344,6 @@ static const AVFilterPad aphaser_outputs[] = { { NULL } }; -static const char *const shorthand[] = { "in_gain", "out_gain", "delay", "decay", "speed", "type", NULL }; - AVFilter avfilter_af_aphaser = { .name = "aphaser", .description = NULL_IF_CONFIG_SMALL("Add a phasing effect to the audio."), @@ -356,5 +354,4 @@ AVFilter avfilter_af_aphaser = { .inputs = aphaser_inputs, .outputs = aphaser_outputs, .priv_class = &aphaser_class, - .shorthand = shorthand, }; diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 0b4fcb3e57..99924ed8a9 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -659,6 +659,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "afade" ) || !strcmp(filter->filter->name, "aformat") || !strcmp(filter->filter->name, "apad" ) || + !strcmp(filter->filter->name, "aphaser" ) || !strcmp(filter->filter->name, "ass") || !strcmp(filter->filter->name, "blackframe") || !strcmp(filter->filter->name, "blend" ) ||