diff options
| author | Kent Mein <mein@cs.umn.edu> | 2006-01-29 18:15:34 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2006-01-29 18:15:34 +0300 |
| commit | e544723e639f93473bfaf2f07179f33bb5daf6d6 (patch) | |
| tree | c117dc86e6cbb0b56fbc6fb81d14d74406306e2f /source/blender/src/writeavicodec.c | |
| parent | 160239ea73c8b82d1fa98933c36f4ac892fe9ece (diff) | |
Fix some of Stealth Apprent's warnings/errors and some extra little stuff.
here is a quick summary...
Kent
intern/bsp/intern/BSP_CSGMesh_CFIterator.h
removed tri_index (unused variable)
intern/bsp/intern/CSG_BooleanOps.cpp
removed extra ;
intern/string/intern/STR_String.cpp
added <ctype.h>
source/blender/blenkernel/BKE_writeavi.h
moved things around so not doing forward declarations
source/blender/renderconverter/intern/convertBlenderScene.c
changed render.h to render_types.h
source/blender/src/blenderbuttons.c
source/blender/src/editgroup.c
source/blender/src/meshtools.c
added newline
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
commented out include "PIL_time.h" code that requires it is commented out
reading blender/src/writeavicodec.c
(struct keyword to a couple of lines that needed it)
and added:
extern struct Render R;
blender/renderconverter/intern/convertBlenderScene.c
added extern Render R;
added #include "rendercore.h" to get rid of undeclared shade_material_loop
(Not sure if this is right but it fixes it.
Did not fix this problem, is it alright to just pass NULL here or should we chan
ge it to something else:
init_render_materials' : too few
gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
removed argument to dHashSpaceCreate
commented out dWorldQuickStep since it does not exist
Diffstat (limited to 'source/blender/src/writeavicodec.c')
| -rw-r--r-- | source/blender/src/writeavicodec.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/src/writeavicodec.c b/source/blender/src/writeavicodec.c index ace6ac8bf25..83b0f466049 100644 --- a/source/blender/src/writeavicodec.c +++ b/source/blender/src/writeavicodec.c @@ -33,10 +33,6 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #if defined(_WIN32) && !defined(FREE_WINDOWS) #define INC_OLE2 @@ -73,10 +69,11 @@ static PAVISTREAM psUncompressed = NULL, psCompressed = NULL; // function definitions static void init_bmi(BITMAPINFOHEADER *bmi); -static void opts_to_acd(AviCodecData *acd); -static void acd_to_opts(AviCodecData *acd); +static void opts_to_acd(struct AviCodecData *acd); +static void acd_to_opts(struct AviCodecData *acd); static void free_opts_data(); static int open_avi_codec_file(char * name); +extern struct Render R; /////////////////////////////////////////////////////////////////////////// // @@ -507,7 +504,7 @@ static void init_bmi(BITMAPINFOHEADER *bmi) } -static void opts_to_acd(AviCodecData *acd) +static void opts_to_acd(struct AviCodecData *acd) { HIC hic; ICINFO icinfo; @@ -546,7 +543,7 @@ static void opts_to_acd(AviCodecData *acd) } -static void acd_to_opts(AviCodecData *acd) +static void acd_to_opts(struct AviCodecData *acd) { memset(&opts, 0, sizeof(opts)); if (acd) { |