aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2011-10-13 17:54:06 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-13 18:08:50 +0200
commit3b316f9f22483d9f9e2f2efdbb5c8213eb87b310 (patch)
tree818d25aa6e9069eadd1aeddc1d8f17ef59624483
parente2abe90ed72f10cb5cb112a7e4a3ad56ee2d4e6c (diff)
downloadffmpeg-3b316f9f22483d9f9e2f2efdbb5c8213eb87b310.tar.gz
vf_scale: remove mathematical constants now redundant.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--doc/filters.texi4
-rw-r--r--libavfilter/vf_scale.c9
2 files changed, 0 insertions, 13 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index cd333c5ecc..fd78a5f054 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1662,10 +1662,6 @@ The parameters @var{width} and @var{height} are expressions containing
the following constants:
@table @option
-@item E, PI, PHI
-the corresponding mathematical approximated values for e
-(euler number), pi (greek PI), phi (golden ratio)
-
@item in_w, in_h
the input width and height
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 04b8d10663..8e258fa5e1 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -32,9 +32,6 @@
#include "libswscale/swscale.h"
static const char *var_names[] = {
- "PI",
- "PHI",
- "E",
"in_w", "iw",
"in_h", "ih",
"out_w", "ow",
@@ -48,9 +45,6 @@ static const char *var_names[] = {
};
enum var_name {
- VAR_PI,
- VAR_PHI,
- VAR_E,
VAR_IN_W, VAR_IW,
VAR_IN_H, VAR_IH,
VAR_OUT_W, VAR_OW,
@@ -155,9 +149,6 @@ static int config_props(AVFilterLink *outlink)
char *expr;
int ret;
- var_values[VAR_PI] = M_PI;
- var_values[VAR_PHI] = M_PHI;
- var_values[VAR_E] = M_E;
var_values[VAR_IN_W] = var_values[VAR_IW] = inlink->w;
var_values[VAR_IN_H] = var_values[VAR_IH] = inlink->h;
var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN;