diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:42:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:44:13 +0200 |
| commit | ae6634da8b81021c15db3048c185a874b2b96505 (patch) | |
| tree | bf4e5a54703b323bbca59afb0bb4ea43dd00d7f0 | |
| parent | 8905a811b79cfda377d2a49f108028d18d5a9799 (diff) | |
| parent | b13623e184759f37348b8fdb1276b1bb408f3e59 (diff) | |
Merge commit 'b13623e184759f37348b8fdb1276b1bb408f3e59'
* commit 'b13623e184759f37348b8fdb1276b1bb408f3e59':
af_volume: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/af_volume.c | 5 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c index 0a6504e118..915a4dc197 100644 --- a/libavfilter/af_volume.c +++ b/libavfilter/af_volume.c @@ -287,16 +287,13 @@ static const AVFilterPad avfilter_af_volume_outputs[] = { { NULL } }; -static const char *const shorthand[] = { "volume", "precision", NULL }; - AVFilter avfilter_af_volume = { .name = "volume", .description = NULL_IF_CONFIG_SMALL("Change input volume."), .query_formats = query_formats, .priv_size = sizeof(VolumeContext), + .priv_class = &volume_class, .init = init, .inputs = avfilter_af_volume_inputs, .outputs = avfilter_af_volume_outputs, - .priv_class = &volume_class, - .shorthand = shorthand, }; diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 1c40d36e38..6e88161277 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -733,6 +733,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "unsharp" ) || // !strcmp(filter->filter->name, "scale" ) || !strcmp(filter->filter->name, "select") || + !strcmp(filter->filter->name, "volume" ) || !strcmp(filter->filter->name, "yadif" ) || 0 ; |