Merge remote-tracking branch 'mbouron/shorthand-cleanup'

* mbouron/shorthand-cleanup: lavfi/kerndeint: switch to AVOption-based system lavfi/il: switch to AVOption-based system

Michael Niedermayer committed 13 years ago

Commit 72ce9792 parents c2696da 531158e4 files · +3 −12Browse files

Unified · Split

4 files

 half of the output image, even lines to the bottom half.
 You can process (filter) them independently and then re-interleave them.
-It accepts a list of options in the form of @var{key}=@var{value} pairs
+The filter accepts the following options:
-separated by ":". A description of the accepted options follows.
 @table @option
 @item luma_mode, l
 deinterling. Work on interlaced parts of a video to produce
 progressive frames.
-This filter accepts parameters as a list of @var{key}=@var{value}
-pairs, separated by ":". If the key of the first options is omitted,
-the arguments are interpreted according to the following syntax:
-@var{thresh}:@var{map}:@var{order}:@var{sharp}:@var{twoway}.
 The description of the accepted parameters follows.
 @table @option

         !strcmp(filter->filter->name,  "geq"       ) ||
         !strcmp(filter->filter->name, "gradfun"    ) ||
         !strcmp(filter->filter->name, "hqdn3d"     ) ||
+        !strcmp(filter->filter->name,  "il"        ) ||
+        !strcmp(filter->filter->name,  "kerndeint" ) ||
         !strcmp(filter->filter->name, "ocv"        ) ||
         !strcmp(filter->filter->name, "life"       ) ||
         !strcmp(filter->filter->name, "lut"        ) ||

     { NULL }
 };
-static const char *const shorthand[] = { NULL };
 AVFilter avfilter_vf_il = {
     .name          = "il",
     .description   = NULL_IF_CONFIG_SMALL("Deinterleave or interleave fields."),
     .inputs        = inputs,
     .outputs       = outputs,
     .priv_class    = &il_class,
-    .shorthand     = shorthand,
 };

     { NULL }
 };
-static const char *const shorthand[] = { "thresh", "map", "order", "sharp", "twoway", NULL };
 AVFilter avfilter_vf_kerndeint = {
     .name          = "kerndeint",
     .outputs       = kerndeint_outputs,
     .priv_class    = &kerndeint_class,
-    .shorthand     = shorthand,
 };

Keyboard shortcuts