[PATCH 01/17] Avoid the use of the symbol ff_expr_s for referencing AVExpr.
Stefano Sabatini
stefano.sabatini-lala
Fri Apr 2 17:15:51 CEST 2010
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.
---
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 0f7c2cb..182bbc5 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 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 4b36483..16b9bb3 100644
--- 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.
--
1.7.0
--9zSXsLTf0vkW971A--
More information about the ffmpeg-devel
mailing list