diff mpegvideo.h @ 3775:8e1ed8300165 libavcodec

Make ratecontrol use ff_eval2().
author takis
date Wed, 27 Sep 2006 19:46:19 +0000
parents 6310389a9688
children 1843a85123b7
line wrap: on
line diff
--- a/mpegvideo.h	Wed Sep 27 11:09:35 2006 +0000
+++ b/mpegvideo.h	Wed Sep 27 19:46:19 2006 +0000
@@ -991,10 +991,16 @@
 float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run);
 void ff_write_pass1_stats(MpegEncContext *s);
 void ff_rate_control_uninit(MpegEncContext *s);
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
 double ff_eval(char *s, double *const_value, const char **const_name,
                double (**func1)(void *, double), const char **func1_name,
                double (**func2)(void *, double, double), char **func2_name,
                void *opaque);
+#endif
+double ff_eval2(char *s, double *const_value, const char **const_name,
+               double (**func1)(void *, double), const char **func1_name,
+               double (**func2)(void *, double, double), char **func2_name,
+               void *opaque, char **error);
 int ff_vbv_update(MpegEncContext *s, int frame_size);
 void ff_get_2pass_fcode(MpegEncContext *s);