diff options
Diffstat (limited to 'source/blender/blenkernel/intern/writeavi.c')
| -rw-r--r-- | source/blender/blenkernel/intern/writeavi.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c index 9f29cb8b137..dab44b5463c 100644 --- a/source/blender/blenkernel/intern/writeavi.c +++ b/source/blender/blenkernel/intern/writeavi.c @@ -47,11 +47,7 @@ #include "BKE_report.h" #include "BKE_writeavi.h" - -/* ********************** general blender movie support ***************************** */ - -#ifdef WITH_AVI -# include "AVI_avi.h" +#include "AVI_avi.h" /* callbacks */ static int start_avi(Scene *scene, RenderData *rd, int rectx, int recty, ReportList *reports); @@ -59,31 +55,30 @@ static void end_avi(void); static int append_avi(RenderData *rd, int start_frame, int frame, int *pixels, int rectx, int recty, ReportList *reports); static void filepath_avi(char *string, RenderData *rd); -#endif /* WITH_AVI */ + +/* ********************** general blender movie support ***************************** */ #ifdef WITH_QUICKTIME -# include "quicktime_export.h" +#include "quicktime_export.h" #endif #ifdef WITH_FFMPEG -# include "BKE_writeffmpeg.h" +#include "BKE_writeffmpeg.h" #endif #include "BKE_writeframeserver.h" bMovieHandle *BKE_movie_handle_get(const char imtype) { - static bMovieHandle mh = {0}; + static bMovieHandle mh; /* set the default handle, as builtin */ -#ifdef WITH_AVI mh.start_movie = start_avi; mh.append_movie = append_avi; mh.end_movie = end_avi; mh.get_next_frame = NULL; mh.get_movie_path = filepath_avi; -#endif - + /* do the platform specific handles */ #ifdef WITH_QUICKTIME if (imtype == R_IMF_IMTYPE_QUICKTIME) { @@ -119,8 +114,6 @@ bMovieHandle *BKE_movie_handle_get(const char imtype) /* ****************************************************************** */ -#ifdef WITH_AVI - static AviMovie *avi = NULL; static void filepath_avi(char *string, RenderData *rd) @@ -226,7 +219,6 @@ static void end_avi(void) MEM_freeN(avi); avi = NULL; } -#endif /* WITH_AVI */ /* similar to BKE_makepicstring() */ void BKE_movie_filepath_get(char *string, RenderData *rd) |