RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vf_scale: remove mathematical constants now redundant. 

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Nicolas George 2011-10-13 17:54:06 +02:00 committed by Michael Niedermayer
parent e2abe90ed7
commit 3b316f9f22
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/filters.texi
View File

@ -1662,10 +1662,6 @@ The parameters @var{width} and @var{height} are expressions containing
the following constants: the following constants:
@table @option @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 @item in_w, in_h
the input width and height the input width and height

9
libavfilter/vf_scale.c
View File

@ -32,9 +32,6 @@
#include "libswscale/swscale.h" #include "libswscale/swscale.h"
static const char *var_names[] = { static const char *var_names[] = {
"PI",
"PHI",
"E",
"in_w", "iw", "in_w", "iw",
"in_h", "ih", "in_h", "ih",
"out_w", "ow", "out_w", "ow",
@ -48,9 +45,6 @@ static const char *var_names[] = {
}; };
enum var_name { enum var_name {
VAR_PI,
VAR_PHI,
VAR_E,
VAR_IN_W, VAR_IW, VAR_IN_W, VAR_IW,
VAR_IN_H, VAR_IH, VAR_IN_H, VAR_IH,
VAR_OUT_W, VAR_OW, VAR_OUT_W, VAR_OW,
@ -155,9 +149,6 @@ static int config_props(AVFilterLink *outlink)
char *expr; char *expr;
int ret; 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_W] = var_values[VAR_IW] = inlink->w;
var_values[VAR_IN_H] = var_values[VAR_IH] = inlink->h; var_values[VAR_IN_H] = var_values[VAR_IH] = inlink->h;
var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN; var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN;