Commit 37438d0a authored by Nicolas George's avatar Nicolas George

lavfi/vf_delogo: use standard options parsing.

parent 40ecd44f
...@@ -171,14 +171,6 @@ static int query_formats(AVFilterContext *ctx) ...@@ -171,14 +171,6 @@ static int query_formats(AVFilterContext *ctx)
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx, const char *args)
{ {
DelogoContext *delogo = ctx->priv; DelogoContext *delogo = ctx->priv;
int ret = 0;
static const char *shorthand[] = { "x", "y", "w", "h", "band", NULL };
delogo->class = &delogo_class;
av_opt_set_defaults(delogo);
if ((ret = av_opt_set_from_string(delogo, args, shorthand, "=", ":")) < 0)
return ret;
#define CHECK_UNSET_OPT(opt) \ #define CHECK_UNSET_OPT(opt) \
if (delogo->opt == -1) { \ if (delogo->opt == -1) { \
...@@ -267,6 +259,8 @@ static const AVFilterPad avfilter_vf_delogo_outputs[] = { ...@@ -267,6 +259,8 @@ static const AVFilterPad avfilter_vf_delogo_outputs[] = {
{ NULL } { NULL }
}; };
static const char *const shorthand[] = { "x", "y", "w", "h", "band", NULL };
AVFilter avfilter_vf_delogo = { AVFilter avfilter_vf_delogo = {
.name = "delogo", .name = "delogo",
.description = NULL_IF_CONFIG_SMALL("Remove logo from input video."), .description = NULL_IF_CONFIG_SMALL("Remove logo from input video."),
...@@ -277,4 +271,5 @@ AVFilter avfilter_vf_delogo = { ...@@ -277,4 +271,5 @@ AVFilter avfilter_vf_delogo = {
.inputs = avfilter_vf_delogo_inputs, .inputs = avfilter_vf_delogo_inputs,
.outputs = avfilter_vf_delogo_outputs, .outputs = avfilter_vf_delogo_outputs,
.priv_class = &delogo_class, .priv_class = &delogo_class,
.shorthand = shorthand,
}; };
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