# HG changeset patch # User stefano # Date 1271011491 0 # Node ID 29fda25001788258d766740b88ce82d359a8ab7e # Parent 2b35577e49dbc216625b7a29345f3799c391a8ef 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. diff -r 2b35577e49db -r 29fda2500178 eval.c --- a/eval.c Sun Apr 11 15:54:45 2010 +0000 +++ b/eval.c Sun Apr 11 18:44:51 2010 +0000 @@ -115,7 +115,7 @@ return 1; } -struct ff_expr_s { +struct AVExpr { enum { e_value, e_const, e_func0, e_func1, e_func2, e_squish, e_gauss, e_ld, @@ -130,7 +130,7 @@ double (*func1)(void *, double); double (*func2)(void *, double, double); } a; - AVExpr *param[2]; + struct AVExpr *param[2]; }; static double eval_expr(Parser * p, AVExpr * e) { diff -r 2b35577e49db -r 29fda2500178 eval.h --- a/eval.h Sun Apr 11 15:54:45 2010 +0000 +++ b/eval.h Sun Apr 11 18:44:51 2010 +0000 @@ -28,7 +28,7 @@ #ifndef AVCODEC_EVAL_H #define AVCODEC_EVAL_H -typedef struct ff_expr_s AVExpr; +typedef struct AVExpr AVExpr; /** * Parses and evaluates an expression.