Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavfilter / vf_settb.c

diff --git a/libavfilter/vf_settb.c b/libavfilter/vf_settb.c
index d0ac35c8f2842f59defe05962157f90fc6fda6ad..b9369d543662afbfacf9c3b6ba184bb040a614ff 100644 (file)
--- a/libavfilter/vf_settb.c
+++ b/libavfilter/vf_settb.c
@@ -30,19 +30,13 @@
 #include "avfilter.h"
 #include "internal.h"
 
-static const char *var_names[] = {
-    "E",
-    "PHI",
-    "PI",
+static const char * const var_names[] = {
     "AVTB",   /* default timebase 1/AV_TIME_BASE */
     "intb",   /* input timebase */
     NULL
 };
 
 enum var_name {
-    VAR_E,
-    VAR_PHI,
-    VAR_PI,
     VAR_AVTB,
     VAR_INTB,
     VAR_VARS_NB
@@ -73,9 +67,6 @@ static int config_output_props(AVFilterLink *outlink)
     int ret;
     double res;
 
-    settb->var_values[VAR_E]    = M_E;
-    settb->var_values[VAR_PHI]  = M_PHI;
-    settb->var_values[VAR_PI]   = M_PI;
     settb->var_values[VAR_AVTB] = av_q2d(AV_TIME_BASE_Q);
     settb->var_values[VAR_INTB] = av_q2d(inlink->time_base);
 
@@ -128,14 +119,14 @@ AVFilter avfilter_vf_settb = {
 
     .priv_size = sizeof(SetTBContext),
 
-    .inputs    = (AVFilterPad[]) {{ .name             = "default",
+    .inputs    = (const AVFilterPad[]) {{ .name       = "default",
                                     .type             = AVMEDIA_TYPE_VIDEO,
                                     .get_video_buffer = avfilter_null_get_video_buffer,
                                     .start_frame      = start_frame,
                                     .end_frame        = avfilter_null_end_frame },
                                   { .name = NULL }},
 
-    .outputs   = (AVFilterPad[]) {{ .name            = "default",
+    .outputs   = (const AVFilterPad[]) {{ .name      = "default",
                                     .type            = AVMEDIA_TYPE_VIDEO,
                                     .config_props    = config_output_props, },
                                   { .name = NULL}},