virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066'

Browse Source 
* commit 'ac20e3ab8ed497549ee2a62754f01eee5e7a5066':
  af_amix: switch to an AVOptions-based system.

Conflicts:
	libavfilter/af_amix.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-11 01:25:08 +02:00
commit 314be1933e
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavfilter/af_amix.c
View File

@ -486,14 +486,7 @@ fail:
static int init(AVFilterContext *ctx, const char *args) static int init(AVFilterContext *ctx, const char *args)
{ {
MixContext *s = ctx->priv; MixContext *s = ctx->priv;
int i, ret; int i;
s->class = &amix_class;
av_opt_set_defaults(s);
if ((ret = av_set_options_string(s, args, "=", ":")) < 0)
return ret;
av_opt_free(s);
for (i = 0; i < s->nb_inputs; i++) { for (i = 0; i < s->nb_inputs; i++) {
char name[32]; char name[32];
@ -556,6 +549,7 @@ AVFilter avfilter_af_amix = {
.name = "amix", .name = "amix",
.description = NULL_IF_CONFIG_SMALL("Audio mixing."), .description = NULL_IF_CONFIG_SMALL("Audio mixing."),
.priv_size = sizeof(MixContext), .priv_size = sizeof(MixContext),
.priv_class = &amix_class,
.init = init, .init = init,
.uninit = uninit, .uninit = uninit,
@ -563,5 +557,4 @@ AVFilter avfilter_af_amix = {
.inputs = NULL, .inputs = NULL,
.outputs = avfilter_af_amix_outputs, .outputs = avfilter_af_amix_outputs,
.priv_class = &amix_class,
}; };

1
libavfilter/avfilter.c
View File

@ -657,6 +657,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
int ret=0; int ret=0;
int anton_options = int anton_options =
!strcmp(filter->filter->name, "aformat") || !strcmp(filter->filter->name, "aformat") ||
!strcmp(filter->filter->name, "amix" ) ||
!strcmp(filter->filter->name, "ass") || !strcmp(filter->filter->name, "ass") ||
!strcmp(filter->filter->name, "blackframe") || !strcmp(filter->filter->name, "blackframe") ||
!strcmp(filter->filter->name, "boxblur" ) || !strcmp(filter->filter->name, "boxblur" ) ||