[FFmpeg-cvslog] avfilter: support alternative keys in the alternative shorthand system

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 15:47:18 2013 +0200| [90efdf98b1ce75dcb45908455f5b194f87d78931] | committer: Michael Niedermayer

avfilter: support alternative keys in the alternative shorthand system

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90efdf98b1ce75dcb45908455f5b194f87d78931
---

 libavfilter/avfilter.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 2fb73c0..2d50e81 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)