Merge commit 'b13623e184759f37348b8fdb1276b1bb408f3e59'

* commit 'b13623e184759f37348b8fdb1276b1bb408f3e59':
  af_volume: switch to an AVOptions-based system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-11 02:42:53 +02:00
commit ae6634da8b
2 changed files with 2 additions and 4 deletions

View File

@ -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,
};

View File

@ -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
;