lavfi/fieldorder: use standard options parsing.
authorClément Bœsch <ubitux@gmail.com>
Sun, 24 Mar 2013 08:02:10 +0000 (09:02 +0100)
committerClément Bœsch <ubitux@gmail.com>
Sun, 24 Mar 2013 11:26:24 +0000 (12:26 +0100)
libavfilter/vf_fieldorder.c

index e9093a0..1ef2ad8 100644 (file)
@@ -60,14 +60,6 @@ AVFILTER_DEFINE_CLASS(fieldorder);
 static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     FieldOrderContext *fieldorder = ctx->priv;
 static av_cold int init(AVFilterContext *ctx, const char *args)
 {
     FieldOrderContext *fieldorder = ctx->priv;
-    int ret;
-    static const char *shorthand[] = { "order", NULL };
-
-    fieldorder->class = &fieldorder_class;
-    av_opt_set_defaults(fieldorder);
-
-    if ((ret = av_opt_set_from_string(fieldorder, args, shorthand, "=", ":")) < 0)
-        return ret;
 
     fieldorder->dst_tff = fieldorder->order == ORDER_TFF;
     av_log(ctx, AV_LOG_VERBOSE, "tff:%d\n", fieldorder->dst_tff);
 
     fieldorder->dst_tff = fieldorder->order == ORDER_TFF;
     av_log(ctx, AV_LOG_VERBOSE, "tff:%d\n", fieldorder->dst_tff);
@@ -204,6 +196,8 @@ static const AVFilterPad avfilter_vf_fieldorder_outputs[] = {
     { NULL }
 };
 
     { NULL }
 };
 
+static const char *const shorthand[] = { "order", NULL };
+
 AVFilter avfilter_vf_fieldorder = {
     .name          = "fieldorder",
     .description   = NULL_IF_CONFIG_SMALL("Set the field order."),
 AVFilter avfilter_vf_fieldorder = {
     .name          = "fieldorder",
     .description   = NULL_IF_CONFIG_SMALL("Set the field order."),
@@ -213,4 +207,5 @@ AVFilter avfilter_vf_fieldorder = {
     .inputs        = avfilter_vf_fieldorder_inputs,
     .outputs       = avfilter_vf_fieldorder_outputs,
     .priv_class    = &fieldorder_class,
     .inputs        = avfilter_vf_fieldorder_inputs,
     .outputs       = avfilter_vf_fieldorder_outputs,
     .priv_class    = &fieldorder_class,
+    .shorthand     = shorthand,
 };
 };