ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Aug 8 14:56:29 2015 +0200| [408c9cf0e21d83d21865c3e27e1c44a9da30a98c] | committer: Michael Niedermayer
cmdutils: Fix overriding flags on the command line. Previously the code just appended the strings of flags which worked with "+bitexact" but would not work with something like "0" Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=408c9cf0e21d83d21865c3e27e1c44a9da30a98c --- cmdutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmdutils.c b/cmdutils.c index e87d5ee..51fd7c9 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -532,7 +532,7 @@ static const AVOption *opt_find(void *obj, const char *name, const char *unit, return o; } -#define FLAGS (o->type == AV_OPT_TYPE_FLAGS) ? AV_DICT_APPEND : 0 +#define FLAGS (o->type == AV_OPT_TYPE_FLAGS && (arg[0]=='-' || arg[0]=='+')) ? AV_DICT_APPEND : 0 int opt_default(void *optctx, const char *opt, const char *arg) { const AVOption *o; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
