summaryrefslogtreecommitdiffstats
path: root/macosx/Controller.mm
diff options
context:
space:
mode:
authorclee <[email protected]>2007-04-15 21:31:00 +0000
committerclee <[email protected]>2007-04-15 21:31:00 +0000
commit10b2dd56f1dca80ba16e27e1e74e3000010222b9 (patch)
tree819489f9122f8d0eb6d3c98dfee28ced534a8eb2 /macosx/Controller.mm
parenta7ce73fc55c72362d9bbfd0f3670ebe849a366dd (diff)
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
Diffstat (limited to 'macosx/Controller.mm')
-rw-r--r--macosx/Controller.mm16
1 files changed, 8 insertions, 8 deletions
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 );
}