[FFmpeg-cvslog] r22839 - in trunk/libavcodec: eval.c eval.h

stefano subversion
Sun Apr 11 20:44:51 CEST 2010


Author: stefano
Date: Sun Apr 11 20:44:51 2010
New Revision: 22839

Log:
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.

Modified:
   trunk/libavcodec/eval.c
   trunk/libavcodec/eval.h

Modified: trunk/libavcodec/eval.c
==============================================================================
--- trunk/libavcodec/eval.c	Sun Apr 11 17:54:45 2010	(r22838)
+++ trunk/libavcodec/eval.c	Sun Apr 11 20:44:51 2010	(r22839)
@@ -115,7 +115,7 @@ static int strmatch(const char *s, const
     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) {

Modified: trunk/libavcodec/eval.h
==============================================================================
--- trunk/libavcodec/eval.h	Sun Apr 11 17:54:45 2010	(r22838)
+++ trunk/libavcodec/eval.h	Sun Apr 11 20:44:51 2010	(r22839)
@@ -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.



More information about the ffmpeg-cvslog mailing list