Revision 1235429c

View differences:

libavcodec/eval.c
369 369
    }
370 370
}
371 371

  
372
AVExpr * ff_parse(const char *s, const char * const *const_name,
372
AVExpr *ff_parse_expr(const char *s, const char * const *const_name,
373 373
               double (**func1)(void *, double), const char **func1_name,
374 374
               double (**func2)(void *, double, double), const char **func2_name,
375 375
               const char **error){
......
416 416
               double (**func1)(void *, double), const char **func1_name,
417 417
               double (**func2)(void *, double, double), const char **func2_name,
418 418
               void *opaque, const char **error){
419
    AVExpr * e = ff_parse(s, const_name, func1, func1_name, func2, func2_name, error);
419
    AVExpr * e = ff_parse_expr(s, const_name, func1, func1_name, func2, func2_name, error);
420 420
    double d;
421 421
    if (!e) return NAN;
422 422
    d = ff_eval_expr(e, const_value, opaque);
libavcodec/eval.h
61 61
 * @return AVExpr which must be freed with ff_free_expr() by the user when it is not needed anymore
62 62
 *         NULL if anything went wrong
63 63
 */
64
AVExpr * ff_parse(const char *s, const char * const *const_name,
64
AVExpr *ff_parse_expr(const char *s, const char * const *const_name,
65 65
               double (**func1)(void *, double), const char **func1_name,
66 66
               double (**func2)(void *, double, double), const char **func2_name,
67 67
               const char **error);
libavcodec/ratecontrol.c
107 107
    };
108 108
    emms_c();
109 109

  
110
    rcc->rc_eq_eval = ff_parse(s->avctx->rc_eq ? s->avctx->rc_eq : "tex^qComp", const_names, func1, func1_names, NULL, NULL, &error);
110
    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);
111 111
    if (!rcc->rc_eq_eval) {
112 112
        av_log(s->avctx, AV_LOG_ERROR, "Error parsing rc_eq \"%s\": %s\n", s->avctx->rc_eq, error? error : "");
113 113
        return -1;

Also available in: Unified diff