Commit f6dd621f authored by michael's avatar michael

Anoter try to make +- behave sanely.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13281 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 1a69cb4e
......@@ -146,6 +146,7 @@ const AVOption *av_set_string(void *obj, const char *name, const char *val){
return o;
}
if(o->type != FF_OPT_TYPE_STRING){
int notfirst=0;
for(;;){
int i;
char buf[256];
......@@ -180,8 +181,8 @@ const AVOption *av_set_string(void *obj, const char *name, const char *val){
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_double(obj, name, NULL) + d;
else if(cmd=='-') d= av_get_double(obj, name, NULL) - d;
if (cmd=='+') d= notfirst*av_get_double(obj, name, NULL) + d;
else if(cmd=='-') d= notfirst*av_get_double(obj, name, NULL) - d;
}
if (!av_set_number(obj, name, d, 1, 1))
......@@ -189,6 +190,7 @@ const AVOption *av_set_string(void *obj, const char *name, const char *val){
val+= i;
if(!*val)
return o;
notfirst=1;
}
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