diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-05-19 22:55:29 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-05-19 22:55:29 +0000 |
| commit | 2b65bb45b59389d25661f3b3df45daa721d8abc8 (patch) | |
| tree | 014e79af6d5d93118e76b7666ffaa1d2cfa56bda /libavcodec/ratecontrol.c | |
| parent | 4880cfd9522fcb0234aacc4e40f0f27729ccee40 (diff) | |
| download | ffmpeg-2b65bb45b59389d25661f3b3df45daa721d8abc8.tar.gz | |
Change eval API to take parent log context and log level offset.
this is based on stefanos work, especially all bugs are his fault ;)
Originally committed as revision 23201 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ratecontrol.c')
| -rw-r--r-- | libavcodec/ratecontrol.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 1c459d8ae9..fe6e4b08ab 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -67,7 +67,6 @@ int ff_rate_control_init(MpegEncContext *s) { RateControlContext *rcc= &s->rc_context; int i; - const char *error = NULL; static const char * const const_names[]={ "PI", "E", @@ -107,9 +106,9 @@ int ff_rate_control_init(MpegEncContext *s) }; 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; } |