Even though removed from vf_scale in 3b316f9f22, they were reintroduced when scale.c, now scale_eval.c, was split off in 037bb4021c
Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -25,9 +25,6 @@ · 24 unmodified lines | |||
| 25 | #include "libavutil/pixdesc.h" | 25 | #include "libavutil/pixdesc.h" |
| 26 | 26 | ||
| 27 | static const char *const var_names[] = { | 27 | static const char *const var_names[] = { |
| 28 | "PI", | ||
| 29 | "PHI", | ||
| 30 | "E", | ||
| 31 | "in_w", "iw", | 28 | "in_w", "iw", |
| 32 | "in_h", "ih", | 29 | "in_h", "ih", |
| 33 | "out_w", "ow", | 30 | "out_w", "ow", |
| @@ -43,9 +40,6 @@ static const char *const var_names[] = { · 9 unmodified lines | |||
| 43 | }; | 40 | }; |
| 44 | 41 | ||
| 45 | enum var_name { | 42 | enum var_name { |
| 46 | VAR_PI, | ||
| 47 | VAR_PHI, | ||
| 48 | VAR_E, | ||
| 49 | VAR_IN_W, VAR_IW, | 43 | VAR_IN_W, VAR_IW, |
| 50 | VAR_IN_H, VAR_IH, | 44 | VAR_IN_H, VAR_IH, |
| 51 | VAR_OUT_W, VAR_OW, | 45 | VAR_OUT_W, VAR_OW, |
| @@ -68,9 +62,6 @@ enum var_name { · 16 unmodified lines | |||
| 68 | * non-scale2ref specific values. | 62 | * non-scale2ref specific values. |
| 69 | */ | 63 | */ |
| 70 | static const char *const var_names_scale2ref[] = { | 64 | static const char *const var_names_scale2ref[] = { |
| 71 | "PI", | ||
| 72 | "PHI", | ||
| 73 | "E", | ||
| 74 | "in_w", "iw", | 65 | "in_w", "iw", |
| 75 | "in_h", "ih", | 66 | "in_h", "ih", |
| 76 | "out_w", "ow", | 67 | "out_w", "ow", |
| @@ -124,9 +115,6 @@ int ff_scale_eval_dimensions(void *log_ctx, · 47 unmodified lines | |||
| 124 | main_desc = av_pix_fmt_desc_get(main_link->format); | 115 | main_desc = av_pix_fmt_desc_get(main_link->format); |
| 125 | } | 116 | } |
| 126 | 117 | ||
| 127 | var_values[VAR_PI] = M_PI; | ||
| 128 | var_values[VAR_PHI] = M_PHI; | ||
| 129 | var_values[VAR_E] = M_E; | ||
| 130 | var_values[VAR_IN_W] = var_values[VAR_IW] = inlink->w; | 118 | var_values[VAR_IN_W] = var_values[VAR_IW] = inlink->w; |
| 131 | var_values[VAR_IN_H] = var_values[VAR_IH] = inlink->h; | 119 | var_values[VAR_IN_H] = var_values[VAR_IH] = inlink->h; |
| 132 | var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN; | 120 | var_values[VAR_OUT_W] = var_values[VAR_OW] = NAN; |