git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
af_amix: switch to an AVOptions-based system.
[ffmpeg.git]
/
libavfilter
/
af_amix.c
diff --git
a/libavfilter/af_amix.c
b/libavfilter/af_amix.c
index
5a4ec2e
..
9aa917e
100644
(file)
--- a/
libavfilter/af_amix.c
+++ b/
libavfilter/af_amix.c
@@
-491,16
+491,7
@@
fail:
static int init(AVFilterContext *ctx, const char *args)
{
MixContext *s = ctx->priv;
static int init(AVFilterContext *ctx, const char *args)
{
MixContext *s = ctx->priv;
- int i, ret;
-
- s->class = &amix_class;
- av_opt_set_defaults(s);
-
- if ((ret = av_set_options_string(s, args, "=", ":")) < 0) {
- av_log(ctx, AV_LOG_ERROR, "Error parsing options string '%s'.\n", args);
- return ret;
- }
- av_opt_free(s);
+ int i;
for (i = 0; i < s->nb_inputs; i++) {
char name[32];
for (i = 0; i < s->nb_inputs; i++) {
char name[32];
@@
-563,6
+554,7
@@
AVFilter avfilter_af_amix = {
.name = "amix",
.description = NULL_IF_CONFIG_SMALL("Audio mixing."),
.priv_size = sizeof(MixContext),
.name = "amix",
.description = NULL_IF_CONFIG_SMALL("Audio mixing."),
.priv_size = sizeof(MixContext),
+ .priv_class = &amix_class,
.init = init,
.uninit = uninit,
.init = init,
.uninit = uninit,