Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Anoter try to make +- behave sanely.

Browse Source 
Originally committed as revision 13281 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 17 years ago
parent ebea1d7668
commit 9d2e6e84ce
1 changed files with 4 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      libavcodec/opt.c

6
libavcodec/opt.c
Unescape View File

@ -146,6 +146,7 @@ const AVOption *av_set_string(void *obj, const char *name, const char *val){
return o; return o;
} }
if(o->type != FF_OPT_TYPE_STRING){ if(o->type != FF_OPT_TYPE_STRING){
int notfirst=0;
for(;;){ for(;;){
int i; int i;
char buf[256]; 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; 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{ }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= 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)) 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; val+= i;
if(!*val) if(!*val)
return o; return o;
notfirst=1;
} }
return NULL; return NULL;
} }

Write Preview
Loading…
Cancel
Save