aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-10 15:47:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-10 15:47:18 +0200
commit90efdf98b1ce75dcb45908455f5b194f87d78931 (patch)
tree4ba91853f2d1a79d503553a3a594450d523fc0cc
parent43bac121d3de0076e76e6f8438934d53f2707ce2 (diff)
downloadffmpeg-90efdf98b1ce75dcb45908455f5b194f87d78931.tar.gz
avfilter: support alternative keys in the alternative shorthand system
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/avfilter.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 2fb73c009f..2d50e819b4 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -623,6 +623,7 @@ static int process_unnamed_options(AVFilterContext *ctx, AVDictionary **options,
const AVOption *o = NULL;
const char *p = args;
char *val;
+ int offset= -1;
while (*p) {
o = av_opt_next(ctx->priv, o);
@@ -631,8 +632,9 @@ static int process_unnamed_options(AVFilterContext *ctx, AVDictionary **options,
"this filter supports.\n");
return AVERROR(EINVAL);
}
- if (o->type == AV_OPT_TYPE_CONST)
+ if (o->type == AV_OPT_TYPE_CONST || o->offset == offset)
continue;
+ offset = o->offset;
val = av_get_token(&p, ":");
if (!val)