Commit 1241ed68 authored by michael's avatar michael

Fix + - bug with non flags.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13243 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent e53794ab
...@@ -179,8 +179,10 @@ const AVOption *av_set_string(void *obj, const char *name, const char *val){ ...@@ -179,8 +179,10 @@ const AVOption *av_set_string(void *obj, const char *name, const char *val){
if(o->type == FF_OPT_TYPE_FLAGS){ if(o->type == FF_OPT_TYPE_FLAGS){
if (cmd=='+') d= av_get_int(obj, name, NULL) | (int64_t)d; if (cmd=='+') d= av_get_int(obj, name, NULL) | (int64_t)d;
else if(cmd=='-') d= av_get_int(obj, name, NULL) &~(int64_t)d; else if(cmd=='-') d= av_get_int(obj, name, NULL) &~(int64_t)d;
}else if(cmd=='-') }else{
d= -d; if (cmd=='+') d= av_get_double(obj, name, NULL) + d;
else if(cmd=='-') d= av_get_double(obj, name, NULL) - d;
}
if (!av_set_number(obj, name, d, 1, 1)) if (!av_set_number(obj, name, d, 1, 1))
return NULL; return NULL;
......
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