aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2011-10-13 17:54:09 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-13 18:08:50 +0200
commit94b345855f436c26ef80d2ea2d4c68bb146cc96f (patch)
tree40d3bd20599cd0215f62f8d714f2abc58800b4fb
parentdb820c3c1338eb4a39ce2c4eec0f9e8f4891b72a (diff)
downloadffmpeg-94b345855f436c26ef80d2ea2d4c68bb146cc96f.tar.gz
vf_settb: 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.texi2
-rw-r--r--libavfilter/vf_settb.c9
2 files changed, 1 insertions, 10 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index 5f3d0906bd..b8bf56de2e 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1954,7 +1954,7 @@ Set the timebase to use for the output frames timestamps.
It is mainly useful for testing timebase configuration.
It accepts in input an arithmetic expression representing a rational.
-The expression can contain the constants "PI", "E", "PHI", "AVTB" (the
+The expression can contain the constants "AVTB" (the
default timebase), and "intb" (the input timebase).
The default value for the input is "intb".
diff --git a/libavfilter/vf_settb.c b/libavfilter/vf_settb.c
index d0ac35c8f2..e74ee65cf2 100644
--- a/libavfilter/vf_settb.c
+++ b/libavfilter/vf_settb.c
@@ -31,18 +31,12 @@
#include "internal.h"
static const char *var_names[] = {
- "E",
- "PHI",
- "PI",
"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);