From 80580b405aea39c9477276e473195e44c29d6ac1 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Sat, 16 Mar 2013 21:27:10 +0100 Subject: lavi/vf_drawbox: use standard options parsing. --- libavfilter/vf_drawbox.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c index 41601b9fab..b831182c8b 100644 --- a/libavfilter/vf_drawbox.c +++ b/libavfilter/vf_drawbox.c @@ -68,14 +68,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args) { DrawBoxContext *drawbox = ctx->priv; uint8_t rgba_color[4]; - static const char *shorthand[] = { "x", "y", "w", "h", "color", "thickness", NULL }; - int ret; - - drawbox->class = &drawbox_class; - av_opt_set_defaults(drawbox); - - if ((ret = av_opt_set_from_string(drawbox, args, shorthand, "=", ":")) < 0) - return ret; if (!strcmp(drawbox->color_str, "invert")) drawbox->invert_color = 1; @@ -92,12 +84,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args) return 0; } -static av_cold void uninit(AVFilterContext *ctx) -{ - DrawBoxContext *drawbox = ctx->priv; - av_opt_free(drawbox); -} - static int query_formats(AVFilterContext *ctx) { static const enum AVPixelFormat pix_fmts[] = { @@ -185,15 +171,17 @@ static const AVFilterPad avfilter_vf_drawbox_outputs[] = { { NULL } }; +static const char *const shorthand[] = { "x", "y", "w", "h", "color", "thickness", NULL }; + AVFilter avfilter_vf_drawbox = { .name = "drawbox", .description = NULL_IF_CONFIG_SMALL("Draw a colored box on the input video."), .priv_size = sizeof(DrawBoxContext), .init = init, - .uninit = uninit, .query_formats = query_formats, .inputs = avfilter_vf_drawbox_inputs, .outputs = avfilter_vf_drawbox_outputs, .priv_class = &drawbox_class, + .shorthand = shorthand, }; -- cgit v1.2.3