SSA subtitle burn in

Anime fans rejoice! This patch adds SSA subtitle burn-in support with libass. 
Therefore SSA subtitles should now be rendered in full quality, with the 
appropriate embedded fonts and positioning information.
Thanks to davidfstr


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

3 files changed, 140 insertions, 17 deletions

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 7fbd5f280..9c7f1999a 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -3183,6 +3183,13 @@ bool one_burned = FALSE;
                             continue;
                         one_burned = TRUE;
                     }
+                    
+                    /* Besides VOBSUBS we can also burn in SSA text subs */
+                    if (subt->source == SSASUB && burned)
+                    {
+                        sub_config.dest = RENDERSUB;
+                    }
+                    
                     sub_config.force = force;
                     sub_config.default_track = def;
                     hb_subtitle_add( job, &sub_config, subtitle );
@@ -3672,13 +3679,20 @@ bool one_burned = FALSE;
                     {
                         sub_config.dest = PASSTHRUSUB;
                     }
-                    else if ( burned && subt->format == PICTURESUB )
+                    else if ( burned  )
                     {
                         // Only allow one subtitle to be burned into the video
                         if (one_burned)
                             continue;
                         one_burned = TRUE;
                     }
+                    
+                    /* Besides VOBSUBS we can also burn in SSA text subs */
+                    if (subt->source == SSASUB && burned)
+                    {
+                        sub_config.dest = RENDERSUB;
+                    }
+
                     sub_config.force = force;
                     sub_config.default_track = def;
                     hb_subtitle_add( job, &sub_config, subtitle );
diff --git a/macosx/HBSubtitles.m b/macosx/HBSubtitles.m
index aca6c023b..b084de525 100644
--- a/macosx/HBSubtitles.m
+++ b/macosx/HBSubtitles.m
@@ -284,6 +284,7 @@
             {
                 NSString * trackTypeString = @"";
                 int isPictureSub = 0;
+                int canBeBurnedIn = 0;
                 subtitle = (hb_subtitle_t *) hb_list_item( fTitle->list_subtitle, i );
                 sub_config = subtitle->config;
                 
@@ -291,12 +292,16 @@
                 {
                     trackTypeString = @"- (Bitmap)";
                     isPictureSub = 1;
+                    canBeBurnedIn = 1;
                 }
                 else
                 {
                     trackTypeString = @"- (Text)";
+                    if(subtitle->source == SSASUB)
+                    {
+                    	canBeBurnedIn = 1;
+                    }
                 }
-                
                 /* create a dictionary of source subtitle information to store in our array */
                 NSString *popupName = [NSString stringWithFormat:@"%d - %@ %@",i,[NSString stringWithUTF8String:subtitle->lang],trackTypeString];
                 NSMutableDictionary *newSubtitleSourceTrack = [[NSMutableDictionary alloc] init];
@@ -308,6 +313,8 @@
                 [newSubtitleSourceTrack setObject:@"Source" forKey:@"sourceTrackType"];
                 /* Subtitle Source track popup isPictureSub */ 
                 [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:isPictureSub] forKey:@"sourceTrackisPictureSub"];
+                /* Subtitle Source track popup canBeBurnedIn */ 
+                [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:canBeBurnedIn] forKey:@"sourceTrackcanBeBurnedIn"];
                 
                 [subtitleSourceArray addObject:newSubtitleSourceTrack];
                 [newSubtitleSourceTrack autorelease];
@@ -343,6 +350,8 @@
     [newSubtitleTrack setObject:@"None" forKey:@"subtitleSourceTrackName"];
     /* Subtitle Source track popup isPictureSub */
     [newSubtitleTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleSourceTrackisPictureSub"];
+    /* Subtitle Source track popup canBeBurnedIn */
+    [newSubtitleTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleSourceTrackcanBeBurnedIn"];
     /* Subtitle track forced state */
     [newSubtitleTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackForced"];
     /* Subtitle track burned state */
@@ -369,8 +378,10 @@
     [newSubtitleSourceTrack setObject:@"SRT" forKey:@"subtitleSourceTrackType"];
     /* Subtitle Source track type */
     [newSubtitleSourceTrack setObject:filePath forKey:@"sourceSrtFilePath"];
-    /* Subtitle Source track popup isPictureSub */ 
+    /* Subtitle Source track popup isPictureSub */
     [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:0] forKey:@"sourceTrackisPictureSub"];
+    /* Subtitle Source track popup canBeBurnedIn */ 
+    [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:0] forKey:@"sourceTrackcanBeBurnedIn"];
     
     [subtitleSourceArray addObject:newSubtitleSourceTrack];
     [newSubtitleSourceTrack autorelease];
@@ -398,6 +409,8 @@
     [newSubtitleSrtTrack setObject:displayname forKey:@"subtitleSourceTrackName"];
     /* Subtitle Source track popup isPictureSub */
     [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleSourceTrackisPictureSub"];
+    /* Subtitle Source track popup canBeBurnedIn */
+    [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleSourceTrackcanBeBurnedIn"];
     /* Subtitle track forced state */
     [newSubtitleSrtTrack setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackForced"];
     /* Subtitle track burned state */
@@ -469,6 +482,8 @@
             [newSubtitleSourceTrack setObject:filePath forKey:@"sourceSrtFilePath"];
             /* Subtitle Source track popup isPictureSub */ 
             [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:0] forKey:@"sourceTrackisPictureSub"];
+            /* Subtitle Source track popup canBeBurnedIn */ 
+            [newSubtitleSourceTrack setObject:[NSNumber numberWithInt:0] forKey:@"sourceTrackcanBeBurnedIn"];
             
             [subtitleSourceArray addObject:newSubtitleSourceTrack];
             [newSubtitleSourceTrack autorelease];
@@ -636,6 +651,7 @@
         {
             int sourceSubtitleIndex;
             bool isPictureSub = FALSE;
+            bool canBeBurnedIn = FALSE;
             
             if (rowIndex == 0)
             {
@@ -649,6 +665,7 @@
             if (rowIndex == 0 && [anObject intValue] == 1)// we are Foreign Launguage Search, which is inherently bitmap
             {
                 isPictureSub = TRUE;
+                canBeBurnedIn = TRUE;
             }
             else
             {
@@ -656,6 +673,10 @@
                 {
                     isPictureSub = TRUE;
                 }
+                if ([[[subtitleSourceArray objectAtIndex:sourceSubtitleIndex] objectForKey:@"sourceTrackcanBeBurnedIn"] intValue] ==1)
+                {
+                    canBeBurnedIn = TRUE;
+                }
             }
             if (isPictureSub == TRUE)
             {
@@ -664,7 +685,15 @@
             else
             {
                 [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:0] forKey:@"subtitleSourceTrackisPictureSub"];
-                /* if we are not picture sub, then we must be a text sub, handbrake does not support burning in text subs */
+            }
+            if (canBeBurnedIn == TRUE)
+            {
+                [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:1] forKey:@"subtitleSourceTrackcanBeBurnedIn"];
+            }
+            else
+            {
+                [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:0] forKey:@"subtitleSourceTrackcanBeBurnedIn"];
+                /* the source track cannot be burned in, so uncheck the widget */
                 [[subtitleArray objectAtIndex:rowIndex] setObject:[NSNumber numberWithInt:0] forKey:@"subtitleTrackBurned"];
             }
             
@@ -854,10 +883,10 @@
         else if ([[aTableColumn identifier] isEqualToString:@"burned"])
         {
             [aCell setState:[[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleTrackBurned"] intValue]];
-            /* Disable the "Burned-In" checkbox if a) the track is "None" or b) the subtitle track is text (we do not support burning in
-             * text subs) */
+            /* Disable the "Burned-In" checkbox if a) the track is "None" or b) the subtitle track is text but not ssa (we do not support burning in
+             * non-ssa text subs) */
             if ([[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackNum"] intValue] == 0 ||
-                [[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackisPictureSub"] intValue] == 0)
+                [[[subtitleArray objectAtIndex:rowIndex] objectForKey:@"subtitleSourceTrackcanBeBurnedIn"] intValue] == 0)
             {
                 [aCell setEnabled:NO];
             }
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index c85135233..660787ae1 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -732,6 +732,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -741,6 +742,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -752,6 +755,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -765,6 +769,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -774,6 +779,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -785,6 +792,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -797,7 +805,7 @@
 				CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
 				CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
 				EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-				EXTERNAL_JOBS = 2;
+				EXTERNAL_JOBS = 1;
 				EXTERNAL_METHOD = xcode;
 				EXTERNAL_SRC = ..;
 				FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -833,6 +841,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -842,6 +851,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -853,6 +864,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -872,6 +884,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -881,6 +894,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -892,6 +907,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -925,7 +941,7 @@
 				CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
 				CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
 				EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-				EXTERNAL_JOBS = 2;
+				EXTERNAL_JOBS = 1;
 				EXTERNAL_METHOD = xcode;
 				EXTERNAL_SRC = ..;
 				FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -961,6 +977,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -970,6 +987,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -981,6 +1000,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1000,6 +1020,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -1009,6 +1030,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1020,6 +1043,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -1053,7 +1077,7 @@
 				CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
 				CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
 				EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-				EXTERNAL_JOBS = 2;
+				EXTERNAL_JOBS = 1;
 				EXTERNAL_METHOD = xcode;
 				EXTERNAL_SRC = ..;
 				FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -1089,6 +1113,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -1098,6 +1123,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1109,6 +1136,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1128,6 +1156,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -1137,6 +1166,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1148,6 +1179,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -1181,7 +1213,7 @@
 				CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
 				CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
 				EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-				EXTERNAL_JOBS = 2;
+				EXTERNAL_JOBS = 1;
 				EXTERNAL_METHOD = xcode;
 				EXTERNAL_SRC = ..;
 				FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -1217,6 +1249,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -1226,6 +1259,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1237,6 +1272,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1256,6 +1292,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -1265,6 +1302,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1276,6 +1315,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -1311,7 +1351,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-				EXTERNAL_JOBS = 2;
+				EXTERNAL_JOBS = 1;
 				EXTERNAL_METHOD = xcode;
 				EXTERNAL_SRC = ..;
 				FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -1348,6 +1388,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -1357,6 +1398,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1368,6 +1411,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1387,6 +1431,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -1396,6 +1441,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1407,6 +1454,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -1442,7 +1490,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-				EXTERNAL_JOBS = 2;
+				EXTERNAL_JOBS = 1;
 				EXTERNAL_METHOD = xcode;
 				EXTERNAL_SRC = ..;
 				FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -1479,6 +1527,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -1488,6 +1537,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1499,6 +1550,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1518,6 +1570,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -1527,6 +1580,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1538,6 +1593,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -1573,7 +1629,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-				EXTERNAL_JOBS = 2;
+				EXTERNAL_JOBS = 1;
 				EXTERNAL_METHOD = xcode;
 				EXTERNAL_SRC = ..;
 				FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -1610,6 +1666,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -1619,6 +1676,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1630,6 +1689,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1649,6 +1709,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -1658,6 +1719,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1669,6 +1732,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -1704,7 +1768,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-				EXTERNAL_JOBS = 2;
+				EXTERNAL_JOBS = 1;
 				EXTERNAL_METHOD = xcode;
 				EXTERNAL_SRC = ..;
 				FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -1741,6 +1805,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -1750,6 +1815,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1761,6 +1828,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1780,6 +1848,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -1789,6 +1858,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1800,6 +1871,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrakeCLI;
 			};
@@ -1880,6 +1952,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -1889,6 +1962,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1900,6 +1975,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1923,6 +1999,7 @@
 				OTHER_LDFLAGS = (
 					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libass.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
@@ -1932,6 +2009,8 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaad.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1943,6 +2022,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
 				);
 				PRODUCT_NAME = HandBrake;
 				WARNING_CFLAGS = (
@@ -1962,7 +2042,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-				EXTERNAL_JOBS = 2;
+				EXTERNAL_JOBS = 1;
 				EXTERNAL_METHOD = xcode;
 				EXTERNAL_SRC = ..;
 				FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";
@@ -1993,7 +2073,7 @@
 				CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
 				CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
 				EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
-				EXTERNAL_JOBS = 2;
+				EXTERNAL_JOBS = 1;
 				EXTERNAL_METHOD = xcode;
 				EXTERNAL_SRC = ..;
 				FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx";