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.

Originally committed as revision 22839 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/eval.c b/libavcodec/eval.c
index 0f7c2cbd4a529064e99ecf65077de19e203be80b..182bbc59c9272e44bf28ad79eaf20eb0457cb293 100644 (file)
--- a/libavcodec/eval.c
+++ b/libavcodec/eval.c
@@ -115,7 +115,7 @@ static int strmatch(const char *s, const char *prefix){
     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 @@ struct ff_expr_s {
         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 --git a/libavcodec/eval.h b/libavcodec/eval.h
index 4b36483c41721b469db96ab0ae4e6dd42ce51386..16b9bb39137d843ba5283097474f445fd0a22bcf 100644 (file)
--- a/libavcodec/eval.h
+++ b/libavcodec/eval.h
@@ -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.