[FFmpeg-devel] [PATCH 1/6] Avoid the use of the symbol ff_expr_s for referencing AVEvalExpr.

[Stefano Sabatini]

---
 libavcodec/eval.c |    4 ++--
 libavcodec/eval.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/eval.c b/libavcodec/eval.c
index 134c43f..2b1fe3c 100644
--- 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 AVEvalExpr {
     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;
-    AVEvalExpr * param[2];
+    struct AVEvalExpr *param[2];
 };
 
 static double eval_expr(Parser * p, AVEvalExpr * e) {
diff --git a/libavcodec/eval.h b/libavcodec/eval.h
index 5481b14..02dd117 100644
--- a/libavcodec/eval.h
+++ b/libavcodec/eval.h
@@ -47,7 +47,7 @@ double ff_eval2(const char *s, const double *const_value, const char * const *co
                double (**func2)(void *, double, double), const char **func2_name,
                void *opaque, const char **error);
 
-typedef struct ff_expr_s AVEvalExpr;
+typedef struct AVEvalExpr AVEvalExpr;
 
 /**
  * Parses a expression.
-- 
1.7.0