aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/eval.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-04-11 11:47:33 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-04-11 11:47:33 +0000
commitf8fea468b2a540651eae731bccc954dbfd71d79d (patch)
tree88b175d2e9fa13058233896990d5775afd6c8979 /libavcodec/eval.c
parent073f6d5b96648d00d9e7af376c558bc85d308748 (diff)
downloadffmpeg-f8fea468b2a540651eae731bccc954dbfd71d79d.tar.gz
Rename ff_eval_free() to ff_free_expr().
Originally committed as revision 22834 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/eval.c')
-rw-r--r--libavcodec/eval.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/eval.c b/libavcodec/eval.c
index 46a894582c..0f7c2cbd4a 100644
--- a/libavcodec/eval.c
+++ b/libavcodec/eval.c
@@ -173,10 +173,10 @@ static double eval_expr(Parser * p, AVExpr * e) {
static AVExpr * parse_expr(Parser *p);
-void ff_eval_free(AVExpr * e) {
+void ff_free_expr(AVExpr * e) {
if (!e) return;
- ff_eval_free(e->param[0]);
- ff_eval_free(e->param[1]);
+ ff_free_expr(e->param[0]);
+ ff_free_expr(e->param[1]);
av_freep(&e);
}
@@ -211,7 +211,7 @@ static AVExpr * parse_primary(Parser *p) {
if(p->s==NULL){
*p->error = "undefined constant or missing (";
p->s= next;
- ff_eval_free(d);
+ ff_free_expr(d);
return NULL;
}
p->s++; // "("
@@ -220,7 +220,7 @@ static AVExpr * parse_primary(Parser *p) {
d = parse_expr(p);
if(p->s[0] != ')'){
*p->error = "missing )";
- ff_eval_free(d);
+ ff_free_expr(d);
return NULL;
}
p->s++; // ")"
@@ -233,7 +233,7 @@ static AVExpr * parse_primary(Parser *p) {
}
if(p->s[0] != ')'){
*p->error = "missing )";
- ff_eval_free(d);
+ ff_free_expr(d);
return NULL;
}
p->s++; // ")"
@@ -282,7 +282,7 @@ static AVExpr * parse_primary(Parser *p) {
}
*p->error = "unknown function";
- ff_eval_free(d);
+ ff_free_expr(d);
return NULL;
}
@@ -404,7 +404,7 @@ AVExpr * ff_parse(const char *s, const char * const *const_name,
e = parse_expr(&p);
if (!verify_expr(e)) {
- ff_eval_free(e);
+ ff_free_expr(e);
e = NULL;
}
end:
@@ -428,7 +428,7 @@ double ff_eval2(const char *s, const double *const_value, const char * const *co
double d;
if (!e) return NAN;
d = ff_parse_eval(e, const_value, opaque);
- ff_eval_free(e);
+ ff_free_expr(e);
return d;
}