highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avutil/opt: Fix parsing regression with constants starting with numbers

Browse Source 
Fixes parsing "3dnow"

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-07-23 08:36:24 +02:00
parent a61325798a
commit bbc5adfb94
1 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavutil/opt.c
View File

@@ -206,12 +206,14 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con
} }
{ {
const AVOption *o_named; const AVOption *o_named = av_opt_find(target_obj, buf, o->unit, 0, 0);
int res; int res;
int ci = 0; int ci = 0;
double const_values[64]; double const_values[64];
const char * const_names[64]; const char * const_names[64];
if (o_named && o_named->type == AV_OPT_TYPE_CONST)
d = DEFAULT_NUMVAL(o_named);
else {
if (o->unit) { if (o->unit) {
for (o_named = NULL; o_named = av_opt_next(target_obj, o_named); ) { for (o_named = NULL; o_named = av_opt_next(target_obj, o_named); ) {
if (o_named->type == AV_OPT_TYPE_CONST && if (o_named->type == AV_OPT_TYPE_CONST &&
@@ -246,6 +248,7 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con
return res; return res;
} }
} }
}
if (o->type == AV_OPT_TYPE_FLAGS) { if (o->type == AV_OPT_TYPE_FLAGS) {
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;