Commit 392ec7ec authored by Nicolas George's avatar Nicolas George

lavfi/vf_pad: use standard options parsing.

parent b201c167
...@@ -111,14 +111,6 @@ AVFILTER_DEFINE_CLASS(pad); ...@@ -111,14 +111,6 @@ AVFILTER_DEFINE_CLASS(pad);
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx, const char *args)
{ {
PadContext *pad = ctx->priv; PadContext *pad = ctx->priv;
static const char *shorthand[] = { "width", "height", "x", "y", "color", NULL };
int ret;
pad->class = &pad_class;
av_opt_set_defaults(pad);
if ((ret = av_opt_set_from_string(pad, args, shorthand, "=", ":")) < 0)
return ret;
if (av_parse_color(pad->rgba_color, pad->color_str, -1, ctx) < 0) if (av_parse_color(pad->rgba_color, pad->color_str, -1, ctx) < 0)
return AVERROR(EINVAL); return AVERROR(EINVAL);
...@@ -126,12 +118,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args) ...@@ -126,12 +118,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
return 0; return 0;
} }
static av_cold void uninit(AVFilterContext *ctx)
{
PadContext *pad = ctx->priv;
av_opt_free(pad);
}
static int config_input(AVFilterLink *inlink) static int config_input(AVFilterLink *inlink)
{ {
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
...@@ -416,17 +402,19 @@ static const AVFilterPad avfilter_vf_pad_outputs[] = { ...@@ -416,17 +402,19 @@ static const AVFilterPad avfilter_vf_pad_outputs[] = {
{ NULL } { NULL }
}; };
static const char *const shorthand[] = { "width", "height", "x", "y", "color", NULL };
AVFilter avfilter_vf_pad = { AVFilter avfilter_vf_pad = {
.name = "pad", .name = "pad",
.description = NULL_IF_CONFIG_SMALL("Pad input image to width:height[:x:y[:color]] (default x and y: 0, default color: black)."), .description = NULL_IF_CONFIG_SMALL("Pad input image to width:height[:x:y[:color]] (default x and y: 0, default color: black)."),
.priv_size = sizeof(PadContext), .priv_size = sizeof(PadContext),
.init = init, .init = init,
.uninit = uninit,
.query_formats = query_formats, .query_formats = query_formats,
.inputs = avfilter_vf_pad_inputs, .inputs = avfilter_vf_pad_inputs,
.outputs = avfilter_vf_pad_outputs, .outputs = avfilter_vf_pad_outputs,
.priv_class = &pad_class, .priv_class = &pad_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