Mercurial > libavcodec.hg
changeset 3786:616a81d04758 libavcodec
Pull out the ff_eval* from the mpegvideo header, as it doesn't belong there and
put it in a separate file.
| author | takis |
|---|---|
| date | Fri, 29 Sep 2006 19:33:04 +0000 |
| parents | 5b987af96509 |
| children | 89ed4a761f51 |
| files | mpegvideo.h opt.c ratecontrol.c |
| diffstat | 3 files changed, 2 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mpegvideo.h Thu Sep 28 22:03:52 2006 +0000 +++ b/mpegvideo.h Fri Sep 29 19:33:04 2006 +0000 @@ -991,16 +991,6 @@ 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);
--- a/opt.c Thu Sep 28 22:03:52 2006 +0000 +++ b/opt.c Fri Sep 29 19:33:04 2006 +0000 @@ -26,7 +26,7 @@ #include "avcodec.h" #include "opt.h" -#include "mpegvideo.h" +#include "eval.h" //FIXME order them and do a bin search static AVOption *find_opt(void *v, const char *name, const char *unit){
--- a/ratecontrol.c Thu Sep 28 22:03:52 2006 +0000 +++ b/ratecontrol.c Fri Sep 29 19:33:04 2006 +0000 @@ -26,6 +26,7 @@ #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" +#include "eval.h" #undef NDEBUG // allways check asserts, the speed effect is far too small to disable them #include <assert.h>