minor code cleanups

2 files changed, 13 insertions, 16 deletions

diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c
index 29734ae13da..c96836b7394 100644
--- a/source/blender/quicktime/apple/quicktime_export.c
+++ b/source/blender/quicktime/apple/quicktime_export.c
@@ -361,7 +361,6 @@ static void QT_DoAddVideoSamplesToMedia (int frame)
 
 static void QT_EndAddVideoSamplesToMedia (void)
 {
-	
 	SCCompressSequenceEnd(qcdx->theComponent);
 
 	UnlockPixels(qte->thePixMap);
@@ -568,16 +567,15 @@ static void check_renderbutton_framerate(void) {
 int get_qtcodec_settings(void) 
 {
 	OSErr	err = noErr;
-	Component c = 0;
-	ComponentDescription cd;
+//	Component c = 0;
+//	ComponentDescription cd;
 	CodecInfo ci;
 
-	cd.componentType = StandardCompressionType;
-	cd.componentSubType = StandardCompressionSubType;
-	cd.componentManufacturer = 0;
-	cd.componentFlags = 0;
-	cd.componentFlagsMask = 0;
-
+//	cd.componentType = StandardCompressionType;
+//	cd.componentSubType = StandardCompressionSubType;
+//	cd.componentManufacturer = 0;
+//	cd.componentFlags = 0;
+//	cd.componentFlagsMask = 0;
 
 	if(qcdx == NULL) {
 		qcdx = MEM_callocN(sizeof(QuicktimeCodecDataExt), "QuicktimeCodecDataExt");
@@ -587,9 +585,9 @@ int get_qtcodec_settings(void)
 	// configure the standard image compression dialog box
 
 	if (qcdx->theComponent == NULL) {
-//		qcdx->theComponent = OpenDefaultComponent(StandardCompressionType, StandardCompressionSubType);
-		c = FindNextComponent(c, &cd);
-		qcdx->theComponent = OpenComponent(c);
+		qcdx->theComponent = OpenDefaultComponent(StandardCompressionType, StandardCompressionSubType);
+//		c = FindNextComponent(c, &cd);
+//		qcdx->theComponent = OpenComponent(c);
 
 //		qcdx->gSpatialSettings.codecType = nil;     
 		qcdx->gSpatialSettings.codec = anyCodec;         
@@ -619,9 +617,8 @@ int get_qtcodec_settings(void)
 	// put up the dialog box
 
 	err = SCRequestSequenceSettings(qcdx->theComponent);
-
  
-   if (err == scUserCancelled) {
+	if (err == scUserCancelled) {
 		G.afbreek = 1;
 		return 0;
 	}
diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c
index c961472318b..798893a053e 100644
--- a/source/blender/quicktime/apple/quicktime_import.c
+++ b/source/blender/quicktime/apple/quicktime_import.c
@@ -489,7 +489,7 @@ ImBuf  *imb_quicktime_decode(unsigned char *mem, int size, int flags)
 	(**dataref).data = mem;
 	(**dataref).dataLength = size;
 
-	err = OpenADataHandler(dataref,
+	err = OpenADataHandler((Handle)dataref,
 							PointerDataHandlerSubType,
 							nil,
 							(OSType)0,
@@ -501,7 +501,7 @@ ImBuf  *imb_quicktime_decode(unsigned char *mem, int size, int flags)
 		goto bail;
 	}
 
-	err = GetGraphicsImporterForDataRef(dataref, PointerDataHandlerSubType, &gImporter);
+	err = GetGraphicsImporterForDataRef((Handle)dataref, PointerDataHandlerSubType, &gImporter);
 	if (err != noErr) {
 		if(QTIME_DEBUG) printf("no graphimport\n");
 		goto bail;