diff ratecontrol.c @ 11749:c6368258b694 libavcodec

Change eval API to take parent log context and log level offset. this is based on stefanos work, especially all bugs are his fault ;)

--- a/ratecontrol.c	Wed May 19 20:48:29 2010 +0000
+++ b/ratecontrol.c	Wed May 19 22:55:29 2010 +0000
@@ -67,7 +67,6 @@
 {
     RateControlContext *rcc= &s->rc_context;
     int i;
-    const char *error = NULL;
     static const char * const const_names[]={
         "PI",
         "E",
@@ -107,9 +106,9 @@
     };
     emms_c();
 
-    rcc->rc_eq_eval = ff_parse_expr(s->avctx->rc_eq ? s->avctx->rc_eq : "tex^qComp", const_names, func1_names, func1, NULL, NULL, &error);
+    rcc->rc_eq_eval = ff_parse_expr(s->avctx->rc_eq ? s->avctx->rc_eq : "tex^qComp", const_names, func1_names, func1, NULL, NULL, 0, s->avctx);
     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 : "");
+        av_log(s->avctx, AV_LOG_ERROR, "Error parsing rc_eq \"%s\"\n", s->avctx->rc_eq);
         return -1;
     }