From: clee <clee@kde.org>
Date: Sun, 15 Apr 2007 21:31:00 +0000 (+0000)
Subject: Unbreak the build! Yay. (Should have been part of r508).
X-Git-Tag: 0.8.5-beta.1~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10b2dd56f1dca80ba16e27e1e74e3000010222b9;p=handbrake

Unbreak the build! Yay. (Should have been part of r508).


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@510 b64f7644-9d1e-0410-96f1-a4d463321fa5
---

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 06f81047a..1fb66bce4 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -793,8 +793,8 @@ static int FormatSettings[3][4] =
 		{
 			
 			/* Lets use this as per Nyx, Thanks Nyx! */
-			job->x264opts = (const char *)calloc(1024, 1); /* Fixme, this just leaks */  
-			strcpy((char *)job->x264opts, [[chosenPreset valueForKey:@"x264Option"] UTF8String]);
+			job->x264opts = (char *)calloc(1024, 1); /* Fixme, this just leaks */  
+			strcpy(job->x264opts, [[chosenPreset valueForKey:@"x264Option"] UTF8String]);
 			//job->x264opts = [[chosenPreset valueForKey:@"x264Option"] cString];
 		}
 		else
@@ -802,8 +802,8 @@ static int FormatSettings[3][4] =
 		    /* if not, then we check to see if there is a x264 opt in the preferences and use that if we want */
 			//job->x264opts = [[[NSUserDefaults standardUserDefaults] stringForKey:@"DefAdvancedx264Flags"] UTF8String];
 			/* Lets use this as per Nyx, Thanks Nyx! */
-			job->x264opts = (const char *)calloc(1024, 1); /* Fixme, this just leaks */  
-			strcpy((char *)job->x264opts, [[[NSUserDefaults standardUserDefaults] stringForKey:@"DefAdvancedx264Flags"] UTF8String]);
+			job->x264opts = (char *)calloc(1024, 1); /* Fixme, this just leaks */  
+			strcpy(job->x264opts, [[[NSUserDefaults standardUserDefaults] stringForKey:@"DefAdvancedx264Flags"] UTF8String]);
 		} 
 		
 		
@@ -911,16 +911,16 @@ static int FormatSettings[3][4] =
 			{
 				
 				/* Lets use this as per Nyx, Thanks Nyx! */
-				job->x264opts = (const char *)calloc(1024, 1); /* Fixme, this just leaks */  
-				strcpy((char *)job->x264opts, [[chosenPreset valueForKey:@"x264Option"] UTF8String]);
+				job->x264opts = (char *)calloc(1024, 1); /* Fixme, this just leaks */  
+				strcpy(job->x264opts, [[chosenPreset valueForKey:@"x264Option"] UTF8String]);
 				//job->x264opts = [[chosenPreset valueForKey:@"x264Option"] cString];
 			}
 			else
 			{
 				//job->x264opts = [[[NSUserDefaults standardUserDefaults] stringForKey:@"DefAdvancedx264Flags"] UTF8String];
 				/* Lets use this as per Nyx, Thanks Nyx! */
-				job->x264opts = (const char *)calloc(1024,1); /* Fixme, this just leaks */ 
-				strcpy((char *)job->x264opts, [[[NSUserDefaults standardUserDefaults]stringForKey:@"DefAdvancedx264Flags"] UTF8String]);
+				job->x264opts = (char *)calloc(1024,1); /* Fixme, this just leaks */ 
+				strcpy(job->x264opts, [[[NSUserDefaults standardUserDefaults]stringForKey:@"DefAdvancedx264Flags"] UTF8String]);
 			} 
 			hb_add( fHandle, job );
 		}