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

[stefano]

Author: stefano
Date: Mon Apr 12 21:21:15 2010
New Revision: 22858

Log:
Rename ff_parse() to ff_parse_expr().

The new name is more expressive and fits better in the overall naming
scheme for the revisited eval API.

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

Modified: trunk/libavcodec/eval.c
==============================================================================
--- trunk/libavcodec/eval.c	Mon Apr 12 21:21:08 2010	(r22857)
+++ trunk/libavcodec/eval.c	Mon Apr 12 21:21:15 2010	(r22858)
@@ -369,7 +369,7 @@ static int verify_expr(AVExpr * e) {
     }
 }
 
-AVExpr * ff_parse(const char *s, const char * const *const_name,
+AVExpr *ff_parse_expr(const char *s, const char * const *const_name,
                double (**func1)(void *, double), const char **func1_name,
                double (**func2)(void *, double, double), const char **func2_name,
                const char **error){
@@ -416,7 +416,7 @@ double ff_parse_and_eval_expr(const char
                double (**func1)(void *, double), const char **func1_name,
                double (**func2)(void *, double, double), const char **func2_name,
                void *opaque, const char **error){
-    AVExpr * e = ff_parse(s, const_name, func1, func1_name, func2, func2_name, error);
+    AVExpr * e = ff_parse_expr(s, const_name, func1, func1_name, func2, func2_name, error);
     double d;
     if (!e) return NAN;
     d = ff_eval_expr(e, const_value, opaque);

Modified: trunk/libavcodec/eval.h
==============================================================================
--- trunk/libavcodec/eval.h	Mon Apr 12 21:21:08 2010	(r22857)
+++ trunk/libavcodec/eval.h	Mon Apr 12 21:21:15 2010	(r22858)
@@ -61,7 +61,7 @@ double ff_parse_and_eval_expr(const char
  * @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,
+AVExpr *ff_parse_expr(const char *s, const char * const *const_name,
                double (**func1)(void *, double), const char **func1_name,
                double (**func2)(void *, double, double), const char **func2_name,
                const char **error);

Modified: trunk/libavcodec/ratecontrol.c
==============================================================================
--- trunk/libavcodec/ratecontrol.c	Mon Apr 12 21:21:08 2010	(r22857)
+++ trunk/libavcodec/ratecontrol.c	Mon Apr 12 21:21:15 2010	(r22858)
@@ -107,7 +107,7 @@ int ff_rate_control_init(MpegEncContext 
     };
     emms_c();
 
-    rcc->rc_eq_eval = ff_parse(s->avctx->rc_eq ? s->avctx->rc_eq : "tex^qComp", const_names, func1, func1_names, NULL, NULL, &error);
+    rcc->rc_eq_eval = ff_parse_expr(s->avctx->rc_eq ? s->avctx->rc_eq : "tex^qComp", const_names, func1, func1_names, NULL, NULL, &error);
     if (!rcc->rc_eq_eval) {
         av_log(s->avctx, AV_LOG_ERROR, "Error parsing rc_eq \"%s\": %s\n", s->avctx->rc_eq, error? error : "");
         return -1;