Mercurial > libavcodec.hg
comparison eval.c @ 11601:29fda2500178 libavcodec
Avoid the use of the symbol ff_expr_s for referencing AVExpr.
This way we have to deal only with struct AVExpr and AVExpr, which is
slightly less confusing as the association between the two symbols is
obvious.
| author | stefano |
|---|---|
| date | Sun, 11 Apr 2010 18:44:51 +0000 |
| parents | fce0ed54244c |
| children | da95280256b4 |
comparison
equal
deleted
inserted
replaced
| 11600:2b35577e49db | 11601:29fda2500178 |
|---|---|
| 113 if(prefix[i] != s[i]) return 0; | 113 if(prefix[i] != s[i]) return 0; |
| 114 } | 114 } |
| 115 return 1; | 115 return 1; |
| 116 } | 116 } |
| 117 | 117 |
| 118 struct ff_expr_s { | 118 struct AVExpr { |
| 119 enum { | 119 enum { |
| 120 e_value, e_const, e_func0, e_func1, e_func2, | 120 e_value, e_const, e_func0, e_func1, e_func2, |
| 121 e_squish, e_gauss, e_ld, | 121 e_squish, e_gauss, e_ld, |
| 122 e_mod, e_max, e_min, e_eq, e_gt, e_gte, | 122 e_mod, e_max, e_min, e_eq, e_gt, e_gte, |
| 123 e_pow, e_mul, e_div, e_add, | 123 e_pow, e_mul, e_div, e_add, |
| 128 int const_index; | 128 int const_index; |
| 129 double (*func0)(double); | 129 double (*func0)(double); |
| 130 double (*func1)(void *, double); | 130 double (*func1)(void *, double); |
| 131 double (*func2)(void *, double, double); | 131 double (*func2)(void *, double, double); |
| 132 } a; | 132 } a; |
| 133 AVExpr *param[2]; | 133 struct AVExpr *param[2]; |
| 134 }; | 134 }; |
| 135 | 135 |
| 136 static double eval_expr(Parser * p, AVExpr * e) { | 136 static double eval_expr(Parser * p, AVExpr * e) { |
| 137 switch (e->type) { | 137 switch (e->type) { |
| 138 case e_value: return e->value; | 138 case e_value: return e->value; |
