From a4c110f8eb8ea1732d3e3f071ead41470abb24cd Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Wed, 5 Apr 2006 15:31:21 +0000 Subject: Two more quicktime changes for compiling after OSX software update --- source/blender/quicktime/apple/quicktime_export.c | 2 +- source/blender/src/playanim.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c index 462ee77cf25..5f5a88cdde6 100644 --- a/source/blender/quicktime/apple/quicktime_export.c +++ b/source/blender/quicktime/apple/quicktime_export.c @@ -269,7 +269,7 @@ static void QT_CreateMyVideoTrack(int rectx, int recty) qtexport->theTrack = NewMovieTrack (qtexport->theMovie, FixRatio(trackFrame.right,1), FixRatio(trackFrame.bottom,1), - kNoVolume); + 0); CheckError( GetMoviesError(), "NewMovieTrack error" ); // SetIdentityMatrix(&myMatrix); diff --git a/source/blender/src/playanim.c b/source/blender/src/playanim.c index f91f97aa54c..13300e0b4b1 100644 --- a/source/blender/src/playanim.c +++ b/source/blender/src/playanim.c @@ -360,6 +360,10 @@ void playanim(int argc, char **argv) #ifdef WITH_QUICKTIME #if defined (_WIN32) || defined (__APPLE__) /* Initialize QuickTime */ +#ifndef noErr +#define noErr 0 +#endif + #ifdef _WIN32 if (InitializeQTML(0) != noErr) G.have_quicktime = FALSE; -- cgit v1.2.3