Commit 67ad9fd0 authored by Clément Bœsch's avatar Clément Bœsch

lavfi/settb: use standard options parsing.

parent 8b994c8c
...@@ -65,27 +65,6 @@ static const AVOption filt_name##_options[] = { ...@@ -65,27 +65,6 @@ static const AVOption filt_name##_options[] = {
{ NULL } \ { NULL } \
} }
static av_cold int init(AVFilterContext *ctx, const char *args, const AVClass *class)
{
SetTBContext *settb = ctx->priv;
static const char *shorthand[] = { "tb", NULL };
int ret;
settb->class = class;
av_opt_set_defaults(settb);
if ((ret = av_opt_set_from_string(settb, args, shorthand, "=", ":")) < 0)
return ret;
return 0;
}
static av_cold void uninit(AVFilterContext *ctx)
{
SetTBContext *settb = ctx->priv;
av_opt_free(settb);
}
static int config_output_props(AVFilterLink *outlink) static int config_output_props(AVFilterLink *outlink)
{ {
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = outlink->src;
...@@ -139,16 +118,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) ...@@ -139,16 +118,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
return ff_filter_frame(outlink, frame); return ff_filter_frame(outlink, frame);
} }
static const char *const shorthand[] = { "tb", NULL };
#if CONFIG_SETTB_FILTER #if CONFIG_SETTB_FILTER
DEFINE_OPTIONS(settb, VIDEO); DEFINE_OPTIONS(settb, VIDEO);
AVFILTER_DEFINE_CLASS(settb); AVFILTER_DEFINE_CLASS(settb);
static av_cold int settb_init(AVFilterContext *ctx, const char *args)
{
return init(ctx, args, &settb_class);
}
static const AVFilterPad avfilter_vf_settb_inputs[] = { static const AVFilterPad avfilter_vf_settb_inputs[] = {
{ {
.name = "default", .name = "default",
...@@ -171,14 +147,13 @@ static const AVFilterPad avfilter_vf_settb_outputs[] = { ...@@ -171,14 +147,13 @@ static const AVFilterPad avfilter_vf_settb_outputs[] = {
AVFilter avfilter_vf_settb = { AVFilter avfilter_vf_settb = {
.name = "settb", .name = "settb",
.description = NULL_IF_CONFIG_SMALL("Set timebase for the video output link."), .description = NULL_IF_CONFIG_SMALL("Set timebase for the video output link."),
.init = settb_init,
.uninit = uninit,
.priv_size = sizeof(SetTBContext), .priv_size = sizeof(SetTBContext),
.inputs = avfilter_vf_settb_inputs, .inputs = avfilter_vf_settb_inputs,
.outputs = avfilter_vf_settb_outputs, .outputs = avfilter_vf_settb_outputs,
.priv_class = &settb_class, .priv_class = &settb_class,
.shorthand = shorthand,
}; };
#endif #endif
...@@ -187,11 +162,6 @@ AVFilter avfilter_vf_settb = { ...@@ -187,11 +162,6 @@ AVFilter avfilter_vf_settb = {
DEFINE_OPTIONS(asettb, AUDIO); DEFINE_OPTIONS(asettb, AUDIO);
AVFILTER_DEFINE_CLASS(asettb); AVFILTER_DEFINE_CLASS(asettb);
static av_cold int asettb_init(AVFilterContext *ctx, const char *args)
{
return init(ctx, args, &asettb_class);
}
static const AVFilterPad avfilter_af_asettb_inputs[] = { static const AVFilterPad avfilter_af_asettb_inputs[] = {
{ {
.name = "default", .name = "default",
...@@ -214,12 +184,11 @@ static const AVFilterPad avfilter_af_asettb_outputs[] = { ...@@ -214,12 +184,11 @@ static const AVFilterPad avfilter_af_asettb_outputs[] = {
AVFilter avfilter_af_asettb = { AVFilter avfilter_af_asettb = {
.name = "asettb", .name = "asettb",
.description = NULL_IF_CONFIG_SMALL("Set timebase for the audio output link."), .description = NULL_IF_CONFIG_SMALL("Set timebase for the audio output link."),
.init = asettb_init,
.uninit = uninit,
.priv_size = sizeof(SetTBContext), .priv_size = sizeof(SetTBContext),
.inputs = avfilter_af_asettb_inputs, .inputs = avfilter_af_asettb_inputs,
.outputs = avfilter_af_asettb_outputs, .outputs = avfilter_af_asettb_outputs,
.priv_class = &asettb_class, .priv_class = &asettb_class,
.shorthand = shorthand,
}; };
#endif #endif
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