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);
}
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++; // "("
d = parse_expr(p);
if(p->s[0] != ')'){
*p->error = "missing )";
- ff_eval_free(d);
+ ff_free_expr(d);
return NULL;
}
p->s++; // ")"
}
if(p->s[0] != ')'){
*p->error = "missing )";
- ff_eval_free(d);
+ ff_free_expr(d);
return NULL;
}
p->s++; // ")"
}
*p->error = "unknown function";
- ff_eval_free(d);
+ ff_free_expr(d);
return NULL;
}
e = parse_expr(&p);
if (!verify_expr(e)) {
- ff_eval_free(e);
+ ff_free_expr(e);
e = NULL;
}
end:
double d;
if (!e) return NAN;
d = ff_parse_eval(e, const_value, opaque);
- ff_eval_free(e);
+ ff_free_expr(e);
return d;
}
* @param func1_name NULL terminated array of zero terminated strings of func1 identifers
* @param func2_name NULL terminated array of zero terminated strings of func2 identifers
* @param error pointer to a char* which is set to an error message if something goes wrong
- * @return AVExpr which must be freed with ff_eval_free by the user when it is not needed anymore
+ * @return AVExpr which must be freed with ff_free_expr() by the user when it is not needed anymore
* NULL if anything went wrong
*/
AVExpr * ff_parse(const char *s, const char * const *const_name,
* @return the value of the expression
*/
double ff_parse_eval(AVExpr * e, const double *const_value, void *opaque);
-void ff_eval_free(AVExpr * e);
+
+void ff_free_expr(AVExpr *e);
/**
* Parses the string in numstr and returns its value as a double. If