[FFmpeg-cvslog] vf_drawtext: remove mathematical constants now redundant.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Thu Oct 13 17:54:02 2011 +0200| [a2af90129597e0552bcadeb8421a6774dbf06c0b] | committer: Michael Niedermayer

vf_drawtext: remove mathematical constants now redundant.

Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2af90129597e0552bcadeb8421a6774dbf06c0b
---

 doc/filters.texi          |    4 ----
 libavfilter/vf_drawtext.c |    9 ---------
 2 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 54c1417..9b1d56b 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -816,10 +816,6 @@ The parameters for @var{x} and @var{y} are expressions containing the
 following constants:
 
 @table @option
- at item E, PI, PHI
-the corresponding mathematical approximated values for e
-(euler number), pi (greek PI), PHI (golden ratio)
-
 @item w, h
 the input width and heigth
 
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index a8d3517..3b74bf4 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -47,9 +47,6 @@
 #include FT_GLYPH_H
 
 static const char *var_names[] = {
-    "E",
-    "PHI",
-    "PI",
     "w",                      ///< width  of the input video
     "h",                      ///< height of the input video
     "tw", "text_w",           ///< width  of the rendered text
@@ -71,9 +68,6 @@ static const char *var_names[] = {
 };
 
 enum var_name {
-    VAR_E,
-    VAR_PHI,
-    VAR_PI,
     VAR_W,
     VAR_H,
     VAR_TW, VAR_TEXT_W,
@@ -459,9 +453,6 @@ static int config_input(AVFilterLink *inlink)
         dtext->shadowcolor[3] = rgba[3];
     }
 
-    dtext->var_values[VAR_E]     = M_E;
-    dtext->var_values[VAR_PHI]   = M_PHI;
-    dtext->var_values[VAR_PI]    = M_PI;
     dtext->var_values[VAR_W]     = inlink->w;
     dtext->var_values[VAR_H]     = inlink->h;
     dtext->var_values[VAR_SAR]   = inlink->sample_aspect_ratio.num ? av_q2d(inlink->sample_aspect_ratio) : 1;