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

fftools/cmdutils: add a struct for a list of SpecifierOpt

Browse Source 
Significantly simplifies the code dealing with OPT_SPEC.
This commit is contained in:
Anton Khirnov
2023-12-17 14:20:57 +01:00
parent 5792382269
commit 0ba70a6792
6 changed files with 118 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fftools/cmdutils.c
View File

@@ -239,25 +239,23 @@ static int write_option(void *optctx, const OptionDef *po, const char *opt,
* a global var*/
void *dst = po->flags & OPT_FLAG_OFFSET ?
(uint8_t *)optctx + po->u.off : po->u.dst_ptr;
int *dstcount;
double num;
int ret;
if (po->flags & OPT_FLAG_SPEC) {
SpecifierOpt **so = dst;
SpecifierOptList *sol = dst;
char *p = strchr(opt, ':');
char *str;
dstcount = (int *)(so + 1);
ret = grow_array((void**)so, sizeof(**so), dstcount, *dstcount + 1);
ret = GROW_ARRAY(sol->opt, sol->nb_opt);
if (ret < 0)
return ret;
str = av_strdup(p ? p + 1 : "");
if (!str)
return AVERROR(ENOMEM);
(*so)[*dstcount - 1].specifier = str;
dst = &(*so)[*dstcount - 1].u;
sol->opt[sol->nb_opt - 1].specifier = str;
dst = &sol->opt[sol->nb_opt - 1].u;
}
if (po->type == OPT_TYPE_STRING) {