Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/quicktime/apple/quicktime_export.c2
-rw-r--r--source/blender/src/playanim.c4
2 files changed, 5 insertions, 1 deletions
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;