xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 20:19:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pull out the ff_eval* from the mpegvideo header, as it doesn't belong there and

Browse Source 
put it in a separate file.

Originally committed as revision 6383 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Panagiotis Issaris 2006-09-29 19:33:04 +00:00
parent 3a6ccf4f3e
commit 4d7b4613a1
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/mpegvideo.h
View File

@ -991,16 +991,6 @@ int ff_rate_control_init(MpegEncContext *s);
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);

2
libavcodec/opt.c
View File

@ -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){

1
libavcodec/ratecontrol.c
View File

@ -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>