diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2007-12-29 23:47:39 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2007-12-29 23:47:39 +0300 |
commit | 47f9c1fa5f14d0a1b39d90fe4a11f752f8dfe463 (patch) | |
tree | 822359757e2948f56268c1d32ce88b27e0e11840 | |
parent | dc98efaaa04cf38d777838fce18948ab64f6fbd5 (diff) |
* some additions and a removal in stubs.c (by elubie)
* mingw config update to link properly with ffmpeg
-rw-r--r-- | config/win32-mingw-config.py | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/stubs.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 54d8e0c6ffd..8c8c12db46f 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -18,7 +18,7 @@ BF_OPENAL_LIB = 'openal_static' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' WITH_BF_FFMPEG = 'false' -BF_FFMPEG_LIB = 'avformat avutil avcodec' +BF_FFMPEG_LIB = 'avformat swscale avcodec avutil xvidcore x264' BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib' BF_FFMPEG_INC = LIBDIR + '/gcc/ffmpeg/include' diff --git a/source/blender/editors/screen/stubs.c b/source/blender/editors/screen/stubs.c index ca592e6812e..b48d342f4c5 100644 --- a/source/blender/editors/screen/stubs.c +++ b/source/blender/editors/screen/stubs.c @@ -34,8 +34,10 @@ void error() {} void set_timecursor() {} void waitcursor() {} void pupmenu() {} -void load_vfont() {} void mainqenter() {} +void saveover() {} + +char texstr[20][12]; /* global vars */ void *editNurb; @@ -90,4 +92,7 @@ void BIF_filelist_freelib() {} void audiostream_play() {} void audiostream_fill() {} - +struct RenderData; +void start_avi_codec(struct RenderData *rd,int rectx, int recty ){} +void append_avi_codec(int frame,int *pixels,int rectx, int recty){}; +void end_avi_codec(void){}; |