[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42673] trunk/blender/source/blender/ quicktime/apple: Fix use of deprecated im_type member in quicktime export.

[Brecht Van Lommel]

Revision: 42673
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42673
Author:   blendix
Date:     2011-12-16 22:33:22 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Fix use of deprecated im_type member in quicktime export.

Modified Paths:
--------------
    trunk/blender/source/blender/quicktime/apple/qtkit_export.m
    trunk/blender/source/blender/quicktime/apple/quicktime_export.c

Modified: trunk/blender/source/blender/quicktime/apple/qtkit_export.m
===================================================================
--- trunk/blender/source/blender/quicktime/apple/qtkit_export.m	2011-12-16 22:00:53 UTC (rev 42672)
+++ trunk/blender/source/blender/quicktime/apple/qtkit_export.m	2011-12-16 22:33:22 UTC (rev 42673)
@@ -658,7 +658,7 @@
 			}
 			else {
 				//Error getting audio packets
-				BKE_reportf(reports, RPT_ERROR, "Unable to get further audio packets from frame %i, error = 0x%x",qtexport->audioTotalExportedFrames,err);
+				BKE_reportf(reports, RPT_ERROR, "Unable to get further audio packets from frame %i, error = 0x%x",(int)qtexport->audioTotalExportedFrames,err);
 				break;
 			}
 
@@ -779,7 +779,7 @@
 
 void quicktime_verify_image_type(RenderData *rd)
 {
-	if (rd->imtype == R_IMF_IMTYPE_QUICKTIME) {
+	if (rd->im_format.imtype == R_IMF_IMTYPE_QUICKTIME) {
 		if ((rd->qtcodecsettings.codecType<= 0) ||
 			(rd->qtcodecsettings.codecSpatialQuality <0) ||
 			(rd->qtcodecsettings.codecSpatialQuality > 100)) {

Modified: trunk/blender/source/blender/quicktime/apple/quicktime_export.c
===================================================================
--- trunk/blender/source/blender/quicktime/apple/quicktime_export.c	2011-12-16 22:00:53 UTC (rev 42672)
+++ trunk/blender/source/blender/quicktime/apple/quicktime_export.c	2011-12-16 22:33:22 UTC (rev 42673)
@@ -689,7 +689,7 @@
 
 void quicktime_verify_image_type(RenderData *rd)
 {
-	if (rd->imtype == R_IMF_IMTYPE_QUICKTIME) {
+	if (rd->im_format.imtype == R_IMF_IMTYPE_QUICKTIME) {
 		if ((rd->qtcodecsettings.codecType== 0) ||
 			(rd->qtcodecsettings.codecSpatialQuality <0) ||
 			(rd->qtcodecsettings.codecSpatialQuality > 100)) {