Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavfilter / vf_setpts.c

diff --git a/libavfilter/vf_setpts.c b/libavfilter/vf_setpts.c
index ecffc0f86804901038f13912f4b6f36dc7edc37f..3fdbd96a32d1511a237465f827d3243efa0e94af 100644 (file)
--- a/libavfilter/vf_setpts.c
+++ b/libavfilter/vf_setpts.c
@@ -2,20 +2,20 @@
  * Copyright (c) 2010 Stefano Sabatini
  * Copyright (c) 2008 Victor Paesa
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -33,11 +33,8 @@
 #include "video.h"
 
 static const char *const var_names[] = {
-    "E",           ///< Euler number
     "INTERLACED",  ///< tell if the current frame is interlaced
     "N",           ///< frame number (starting at zero)
-    "PHI",         ///< golden ratio
-    "PI",          ///< greek pi
     "POS",         ///< original position in the file of the frame
     "PREV_INPTS",  ///< previous  input PTS
     "PREV_OUTPTS", ///< previous output PTS
@@ -48,11 +45,8 @@ static const char *const var_names[] = {
 };
 
 enum var_name {
-    VAR_E,
     VAR_INTERLACED,
     VAR_N,
-    VAR_PHI,
-    VAR_PI,
     VAR_POS,
     VAR_PREV_INPTS,
     VAR_PREV_OUTPTS,
@@ -78,10 +72,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
         return ret;
     }
 
-    setpts->var_values[VAR_E          ] = M_E;
     setpts->var_values[VAR_N          ] = 0.0;
-    setpts->var_values[VAR_PHI        ] = M_PHI;
-    setpts->var_values[VAR_PI         ] = M_PI;
     setpts->var_values[VAR_PREV_INPTS ] = NAN;
     setpts->var_values[VAR_PREV_OUTPTS] = NAN;
     setpts->var_values[VAR_STARTPTS   ] = NAN;
@@ -148,13 +139,13 @@ AVFilter avfilter_vf_setpts = {
 
     .priv_size = sizeof(SetPTSContext),
 
-    .inputs    = (AVFilterPad[]) {{ .name             = "default",
+    .inputs    = (const AVFilterPad[]) {{ .name       = "default",
                                     .type             = AVMEDIA_TYPE_VIDEO,
                                     .get_video_buffer = ff_null_get_video_buffer,
                                     .config_props     = config_input,
                                     .start_frame      = start_frame, },
                                   { .name = NULL }},
-    .outputs   = (AVFilterPad[]) {{ .name             = "default",
+    .outputs   = (const AVFilterPad[]) {{ .name       = "default",
                                     .type             = AVMEDIA_TYPE_VIDEO, },
                                   { .name = NULL}},
 };