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

fftools/ffmpeg: _-prefix variables in MATCH_PER_STREAM_OPT()

Browse Source 
Avoids conflicts, e.g. when 'i' is used in the outvar expression.
This commit is contained in:
Anton Khirnov
2022-11-17 10:38:12 +01:00
parent 996fed5235
commit 3da5c60aa9
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fftools/ffmpeg.h
View File

@@ -783,26 +783,26 @@ InputStream *ist_iter(InputStream *prev);
{\ {\
char namestr[128] = "";\ char namestr[128] = "";\
const char *spec = so->specifier && so->specifier[0] ? so->specifier : "";\ const char *spec = so->specifier && so->specifier[0] ? so->specifier : "";\
for (i = 0; opt_name_##name[i]; i++)\ for (int _i = 0; opt_name_##name[_i]; _i++)\
av_strlcatf(namestr, sizeof(namestr), "-%s%s", opt_name_##name[i], opt_name_##name[i+1] ? (opt_name_##name[i+2] ? ", " : " or ") : "");\ av_strlcatf(namestr, sizeof(namestr), "-%s%s", opt_name_##name[_i], opt_name_##name[_i+1] ? (opt_name_##name[_i+2] ? ", " : " or ") : "");\
av_log(NULL, AV_LOG_WARNING, "Multiple %s options specified for stream %d, only the last option '-%s%s%s "SPECIFIER_OPT_FMT_##type"' will be used.\n",\ av_log(NULL, AV_LOG_WARNING, "Multiple %s options specified for stream %d, only the last option '-%s%s%s "SPECIFIER_OPT_FMT_##type"' will be used.\n",\
namestr, st->index, opt_name_##name[0], spec[0] ? ":" : "", spec, so->u.type);\ namestr, st->index, opt_name_##name[0], spec[0] ? ":" : "", spec, so->u.type);\
} }
#define MATCH_PER_STREAM_OPT(name, type, outvar, fmtctx, st)\ #define MATCH_PER_STREAM_OPT(name, type, outvar, fmtctx, st)\
{\ {\
int i, ret, matches = 0;\ int _ret, _matches = 0;\
SpecifierOpt *so;\ SpecifierOpt *so;\
for (i = 0; i < o->nb_ ## name; i++) {\ for (int _i = 0; _i < o->nb_ ## name; _i++) {\
char *spec = o->name[i].specifier;\ char *spec = o->name[_i].specifier;\
if ((ret = check_stream_specifier(fmtctx, st, spec)) > 0) {\ if ((_ret = check_stream_specifier(fmtctx, st, spec)) > 0) {\
outvar = o->name[i].u.type;\ outvar = o->name[_i].u.type;\
so = &o->name[i];\ so = &o->name[_i];\
matches++;\ _matches++;\
} else if (ret < 0)\ } else if (_ret < 0)\
exit_program(1);\ exit_program(1);\
}\ }\
if (matches > 1)\ if (_matches > 1)\
WARN_MULTIPLE_OPT_USAGE(name, type, so, st);\ WARN_MULTIPLE_OPT_USAGE(name, type, so, st);\
} }