Unified · Split
| @@ -41,7 +41,8 @@ · 40 unmodified lines | |||
| 41 | static const char *const var_names[] = { | 41 | static const char *const var_names[] = { |
| 42 | "w", | 42 | "w", |
| 43 | "h", | 43 | "h", |
| 44 | "a", "dar", | 44 | "a", |
| 45 | "dar", | ||
| 45 | "sar", | 46 | "sar", |
| 46 | "hsub", | 47 | "hsub", |
| 47 | "vsub", | 48 | "vsub", |
| @@ -51,7 +52,8 @@ static const char *const var_names[] = { · 3 unmodified lines | |||
| 51 | enum var_name { | 52 | enum var_name { |
| 52 | VAR_W, | 53 | VAR_W, |
| 53 | VAR_H, | 54 | VAR_H, |
| 54 | VAR_A, VAR_DAR, | 55 | VAR_A, |
| 56 | VAR_DAR, | ||
| 55 | VAR_SAR, | 57 | VAR_SAR, |
| 56 | VAR_HSUB, | 58 | VAR_HSUB, |
| 57 | VAR_VSUB, | 59 | VAR_VSUB, |
| @@ -105,8 +107,8 @@ static int get_aspect_ratio(AVFilterLink *inlink, AVRational *aspect_ratio) · 47 unmodified lines | |||
| 105 | 107 | ||
| 106 | /* evaluate new aspect ratio*/ | 108 | /* evaluate new aspect ratio*/ |
| 107 | ret = av_expr_parse_and_eval(&res, s->ratio_expr, | 109 | ret = av_expr_parse_and_eval(&res, s->ratio_expr, |
| 108 | var_names, var_values, | 110 | var_names, var_values, |
| 109 | NULL, NULL, NULL, NULL, NULL, 0, ctx); | 111 | NULL, NULL, NULL, NULL, NULL, 0, ctx); |
| 110 | if (ret < 0) { | 112 | if (ret < 0) { |
| 111 | ret = av_parse_ratio(aspect_ratio, s->ratio_expr, s->max, 0, ctx); | 113 | ret = av_parse_ratio(aspect_ratio, s->ratio_expr, s->max, 0, ctx); |
| 112 | } else | 114 | } else |