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

vf_overlay: 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:04 +02:00 committed by Michael Niedermayer
parent 157ff97e3b
commit 8c88d734a5
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/vf_overlay.c
View File

@ -34,9 +34,6 @@
#include "internal.h" #include "internal.h"
static const char *var_names[] = { static const char *var_names[] = {
"E",
"PHI",
"PI",
"main_w", "W", ///< width of the main video "main_w", "W", ///< width of the main video
"main_h", "H", ///< height of the main video "main_h", "H", ///< height of the main video
"overlay_w", "w", ///< width of the overlay video "overlay_w", "w", ///< width of the overlay video
@ -45,9 +42,6 @@ static const char *var_names[] = {
}; };
enum var_name { enum var_name {
VAR_E,
VAR_PHI,
VAR_PI,
VAR_MAIN_W, VAR_MW, VAR_MAIN_W, VAR_MW,
VAR_MAIN_H, VAR_MH, VAR_MAIN_H, VAR_MH,
VAR_OVERLAY_W, VAR_OW, VAR_OVERLAY_W, VAR_OW,
@ -126,10 +120,6 @@ static int config_input_overlay(AVFilterLink *inlink)
/* Finish the configuration by evaluating the expressions /* Finish the configuration by evaluating the expressions
now when both inputs are configured. */ now when both inputs are configured. */
var_values[VAR_E ] = M_E;
var_values[VAR_PHI] = M_PHI;
var_values[VAR_PI ] = M_PI;
var_values[VAR_MAIN_W ] = var_values[VAR_MW] = ctx->inputs[MAIN ]->w; var_values[VAR_MAIN_W ] = var_values[VAR_MW] = ctx->inputs[MAIN ]->w;
var_values[VAR_MAIN_H ] = var_values[VAR_MH] = ctx->inputs[MAIN ]->h; var_values[VAR_MAIN_H ] = var_values[VAR_MH] = ctx->inputs[MAIN ]->h;
var_values[VAR_OVERLAY_W] = var_values[VAR_OW] = ctx->inputs[OVERLAY]->w; var_values[VAR_OVERLAY_W] = var_values[VAR_OW] = ctx->inputs[OVERLAY]->w;