MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/delogo: remove sscanf and rely on av_opt_set_from_string() only.

Browse Source
This commit is contained in:
Clément Bœsch 2013-03-13 04:21:53 +01:00
parent 20dab078e6
commit de3e0ab35f
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/vf_delogo.c
View File

@ -172,17 +172,12 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
{
DelogoContext *delogo = ctx->priv;
int ret = 0;
static const char *shorthand[] = { "x", "y", "w", "h", "band" };
delogo->class = &delogo_class;
av_opt_set_defaults(delogo);
if (args)
ret = sscanf(args, "%d:%d:%d:%d:%d",
&delogo->x, &delogo->y, &delogo->w, &delogo->h, &delogo->band);
if (ret == 5) {
if (delogo->band < 0)
delogo->show = 1;
} else if ((ret = (av_set_options_string(delogo, args, "=", ":"))) < 0)
if ((ret = av_opt_set_from_string(delogo, args, shorthand, "=", ":")) < 0)
return ret;
#define CHECK_UNSET_OPT(opt) \
@ -195,8 +190,10 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
CHECK_UNSET_OPT(w);
CHECK_UNSET_OPT(h);
if (delogo->show)
if (delogo->band < 0 || delogo->show) {
delogo->show = 1;
delogo->band = 4;
}
av_log(ctx, AV_LOG_VERBOSE, "x:%d y:%d, w:%d h:%d band:%d show:%d\n",
delogo->x, delogo->y, delogo->w, delogo->h, delogo->band, delogo->show);