Commit 2c5c7f10 authored by Michael Niedermayer's avatar Michael Niedermayer

avutil/opt: remove dead code from set_string_number()

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 4927c0a9
...@@ -194,7 +194,7 @@ static int set_string(void *obj, const AVOption *o, const char *val, uint8_t **d ...@@ -194,7 +194,7 @@ static int set_string(void *obj, const AVOption *o, const char *val, uint8_t **d
static int set_string_number(void *obj, void *target_obj, const AVOption *o, const char *val, void *dst) static int set_string_number(void *obj, void *target_obj, const AVOption *o, const char *val, void *dst)
{ {
int ret = 0, notfirst = 0; int ret = 0;
int num, den; int num, den;
char c; char c;
...@@ -215,8 +215,6 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con ...@@ -215,8 +215,6 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con
if (*val == '+' || *val == '-') { if (*val == '+' || *val == '-') {
if (o->type == AV_OPT_TYPE_FLAGS) if (o->type == AV_OPT_TYPE_FLAGS)
cmd = *(val++); cmd = *(val++);
else if (!notfirst)
buf[i++] = *val;
} }
for (; i < sizeof(buf) - 1 && val[i] && (o->type != AV_OPT_TYPE_FLAGS || val[i] != '+' && val[i] != '-'); i++) for (; i < sizeof(buf) - 1 && val[i] && (o->type != AV_OPT_TYPE_FLAGS || val[i] != '+' && val[i] != '-'); i++)
...@@ -244,10 +242,6 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con ...@@ -244,10 +242,6 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con
read_number(o, dst, NULL, NULL, &intnum); read_number(o, dst, NULL, NULL, &intnum);
if (cmd == '+') d = intnum | (int64_t)d; if (cmd == '+') d = intnum | (int64_t)d;
else if (cmd == '-') d = intnum &~(int64_t)d; else if (cmd == '-') d = intnum &~(int64_t)d;
} else {
read_number(o, dst, &num, &den, &intnum);
if (cmd == '+') d = notfirst*num*intnum/den + d;
else if (cmd == '-') d = notfirst*num*intnum/den - d;
} }
if ((ret = write_number(obj, o, dst, d, 1, 1)) < 0) if ((ret = write_number(obj, o, dst, d, 1, 1)) < 0)
...@@ -255,7 +249,6 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con ...@@ -255,7 +249,6 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con
val += i; val += i;
if (!*val) if (!*val)
return 0; return 0;
notfirst = 1;
} }
return 0; return 0;
......
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