Merge commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd'

* commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd':
  vf_settb: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/f_settb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

doc/filters.texi

@@ -6915,9 +6915,14 @@ ffmpeg -nostats -i input.mp3 -filter_complex ebur128 -f null -
 Set the timebase to use for the output frames timestamps.
 It is mainly useful for testing timebase configuration.
 
-This filter accepts a single option @option{tb}, which can be
-specified either by setting @option{tb}=@var{VALUE} or setting the
-value alone.
+This filter accepts the following options:
+
+@table @option
+
+@item expr
+The expression which is evaluated into the output timebase.
+
+@end table
 
 The value for @option{tb} is an arithmetic expression representing a
 rational. The expression can contain the constants "AVTB" (the default
@@ -6930,13 +6935,13 @@ audio only). Default value is "intb".
 @item
 Set the timebase to 1/25:
 @example
-settb=1/25
+settb=expr=1/25
 @end example
 
 @item
 Set the timebase to 1/10:
 @example
-settb=0.1
+settb=expr=0.1
 @end example
 
 @item

libavfilter/avfilter.c

@@ -691,6 +691,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
         !strcmp(filter->filter->name, "aperms") ||
         !strcmp(filter->filter->name, "resample") ||
         !strcmp(filter->filter->name, "setpts"       ) ||
+        !strcmp(filter->filter->name, "settb"        ) ||
         !strcmp(filter->filter->name, "showspectrum") ||
         !strcmp(filter->filter->name, "silencedetect") ||
         !strcmp(filter->filter->name, "smartblur") ||

libavfilter/f_settb.c

@@ -60,7 +60,7 @@ typedef struct {
 #define OFFSET(x) offsetof(SetTBContext, x)
 #define DEFINE_OPTIONS(filt_name, filt_type)                                               \
 static const AVOption filt_name##_options[] = {                                            \
-    { "tb", "set timebase expression", OFFSET(tb_expr), AV_OPT_TYPE_STRING, {.str="intb"}, \
+    { "tb", "Expression determining the output timebase", OFFSET(tb_expr), AV_OPT_TYPE_STRING, {.str="intb"}, \
            .flags=AV_OPT_FLAG_##filt_type##_PARAM|AV_OPT_FLAG_FILTERING_PARAM },           \
     { NULL }                                                                               \
 }
@@ -149,11 +149,10 @@ AVFilter avfilter_vf_settb = {
     .description = NULL_IF_CONFIG_SMALL("Set timebase for the video output link."),
 
     .priv_size = sizeof(SetTBContext),
+    .priv_class = &settb_class,
 
     .inputs    = avfilter_vf_settb_inputs,
     .outputs   = avfilter_vf_settb_outputs,
-    .priv_class = &settb_class,
-    .shorthand  = shorthand,
 };
 #endif