Commit 90efdf98 authored by Michael Niedermayer's avatar Michael Niedermayer

avfilter: support alternative keys in the alternative shorthand system

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 43bac121
...@@ -623,6 +623,7 @@ static int process_unnamed_options(AVFilterContext *ctx, AVDictionary **options, ...@@ -623,6 +623,7 @@ static int process_unnamed_options(AVFilterContext *ctx, AVDictionary **options,
const AVOption *o = NULL; const AVOption *o = NULL;
const char *p = args; const char *p = args;
char *val; char *val;
int offset= -1;
while (*p) { while (*p) {
o = av_opt_next(ctx->priv, o); o = av_opt_next(ctx->priv, o);
...@@ -631,8 +632,9 @@ static int process_unnamed_options(AVFilterContext *ctx, AVDictionary **options, ...@@ -631,8 +632,9 @@ static int process_unnamed_options(AVFilterContext *ctx, AVDictionary **options,
"this filter supports.\n"); "this filter supports.\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (o->type == AV_OPT_TYPE_CONST) if (o->type == AV_OPT_TYPE_CONST || o->offset == offset)
continue; continue;
offset = o->offset;
val = av_get_token(&p, ":"); val = av_get_token(&p, ":");
if (!val) if (!val)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment