bump ffmpeg from git-185a155 to git-0b32da9

[handbrake-jp/handbrake-jp-git.git] / macosx / HandBrake.xcodeproj / project.pbxproj

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 1ecd536..4a20105 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -17,6 +17,9 @@
                25DE1FB70C169A0C00F01FC8 /* HBPreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 25DE1FB50C169A0C00F01FC8 /* HBPreferencesController.m */; };
                2713E6300F676510002E0A01 /* libhb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2713E50C0F675F32002E0A01 /* libhb.a */; };
                2713E6420F676526002E0A01 /* libhb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2713E50C0F675F32002E0A01 /* libhb.a */; };
+               2728D25B0FE8419900758EC9 /* HandBrake-64.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2728D25A0FE8419900758EC9 /* HandBrake-64.icns */; };
+               274DD1E40FEF109900881E69 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 274DD1E30FEF109900881E69 /* libiconv.dylib */; };
+               274DD20B0FEF10FD00881E69 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 274DD1E30FEF109900881E69 /* libiconv.dylib */; };
                2774BE900F66F47100B65FC6 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2774BE8F0F66F47100B65FC6 /* libbz2.dylib */; };
                2774BE920F66F48200B65FC6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2774BE910F66F48200B65FC6 /* libz.dylib */; };
                2774BEC70F66F61A00B65FC6 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2774BE8F0F66F47100B65FC6 /* libbz2.dylib */; };
@@ -27,8 +30,8 @@
                4DD93F92082036E8008E1322 /* HBPreviewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D1FD381073D19CE00E46515 /* HBPreviewController.h */; };
                4DD93F97082036E8008E1322 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
                4DD93F9A082036E8008E1322 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; settings = {ATTRIBUTES = (); }; };
-               4DD93F9B082036E8008E1322 /* Controller.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4DF3C8CC052889CD00A80101 /* Controller.mm */; };
-               4DD93F9E082036E8008E1322 /* HBPreviewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4D1FD382073D19CE00E46515 /* HBPreviewController.mm */; };
+               4DD93F9B082036E8008E1322 /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DF3C8CC052889CD00A80101 /* Controller.m */; };
+               4DD93F9E082036E8008E1322 /* HBPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1FD382073D19CE00E46515 /* HBPreviewController.m */; };
                4DD93FA2082036E8008E1322 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
                4DD93FA3082036E8008E1322 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DEB2024052B055F00C39CA9 /* IOKit.framework */; };
                4DD93FA4082036E8008E1322 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */; };
@@ -37,6 +40,7 @@
                A20F47010EBB5EC2005B861B /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A20F47000EBB5EC2005B861B /* QTKit.framework */; };
                A22C85EC0D05D35000C10E36 /* HBPresets.h in Headers */ = {isa = PBXBuildFile; fileRef = A22C85EA0D05D35000C10E36 /* HBPresets.h */; };
                A22C85ED0D05D35100C10E36 /* HBPresets.m in Sources */ = {isa = PBXBuildFile; fileRef = A22C85EB0D05D35000C10E36 /* HBPresets.m */; };
+               A256080C0FD06720006A4277 /* Brushed_Window.png in Resources */ = {isa = PBXBuildFile; fileRef = A256080B0FD06720006A4277 /* Brushed_Window.png */; };
                A25962E10F15077500B3BF4E /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A25962E00F15077500B3BF4E /* Quartz.framework */; };
                A273E0510C57B39A00493A45 /* Pause.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04A0C57B39A00493A45 /* Pause.tiff */; };
                A273E0520C57B39A00493A45 /* Play.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04B0C57B39A00493A45 /* Play.tiff */; };
@@ -47,9 +51,11 @@
                A2A1EC310C76C35E00827E0D /* HBDVDDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */; };
                A2A1EC3A0C76C58400827E0D /* HBDVDDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A1EC390C76C58400827E0D /* HBDVDDetector.m */; };
                A2BEA5FB0F2A1ED1001CE7A1 /* PictureController.h in Headers */ = {isa = PBXBuildFile; fileRef = A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */; };
-               A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */; };
+               A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */; };
                A2D0A0AB0D3E5929002D57CB /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */; };
                A2D0A0BF0D3E596F002D57CB /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */; };
+               A2D18AA70FD81C50003C997B /* HBSubtitles.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D18AA50FD81C50003C997B /* HBSubtitles.h */; };
+               A2D18AA80FD81C50003C997B /* HBSubtitles.m in Sources */ = {isa = PBXBuildFile; fileRef = A2D18AA60FD81C50003C997B /* HBSubtitles.m */; };
                A2D7AD670C998AD30082CA33 /* ActivityWindow.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */; };
                A2D7AD680C998AD30082CA33 /* AddToQueue.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD5F0C998AD30082CA33 /* AddToQueue.tiff */; };
                A2D7AD690C998AD30082CA33 /* Drawer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD600C998AD30082CA33 /* Drawer.tiff */; };
@@ -61,6 +67,10 @@
                A906A0520F7A7B210007A827 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A906A0500F7A7B210007A827 /* AudioToolbox.framework */; };
                A9AC41DF0C918DB500DDF9B8 /* HBAdvancedController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9AC41DD0C918DB500DDF9B8 /* HBAdvancedController.m */; };
                A9AC41E00C918DB500DDF9B8 /* HBAdvancedController.h in Headers */ = {isa = PBXBuildFile; fileRef = A9AC41DE0C918DB500DDF9B8 /* HBAdvancedController.h */; };
+               D234BCBD1240E82800BE2E98 /* HBAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = D234BCB91240E82800BE2E98 /* HBAudio.h */; };
+               D234BCBE1240E82800BE2E98 /* HBAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = D234BCBA1240E82800BE2E98 /* HBAudio.m */; };
+               D234BCBF1240E82800BE2E98 /* HBAudioController.h in Headers */ = {isa = PBXBuildFile; fileRef = D234BCBB1240E82800BE2E98 /* HBAudioController.h */; };
+               D234BCC01240E82800BE2E98 /* HBAudioController.m in Sources */ = {isa = PBXBuildFile; fileRef = D234BCBC1240E82800BE2E98 /* HBAudioController.m */; };
                D289A9F30DBBE7AC00CE614B /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D289A9F20DBBE7AC00CE614B /* CoreServices.framework */; };
                D289AAC40DBBF3F100CE614B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DEB2024052B055F00C39CA9 /* IOKit.framework */; };
                E3003C7F0C88505D0072F2A8 /* DeleteHighlightPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = E3003C7E0C88505D0072F2A8 /* DeleteHighlightPressed.png */; };
@@ -141,6 +151,8 @@
                25DE1FB40C169A0C00F01FC8 /* HBPreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPreferencesController.h; sourceTree = "<group>"; };
                25DE1FB50C169A0C00F01FC8 /* HBPreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPreferencesController.m; sourceTree = "<group>"; };
                2713E50C0F675F32002E0A01 /* libhb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhb.a; path = libhb/libhb.a; sourceTree = BUILT_PRODUCTS_DIR; };
+               2728D25A0FE8419900758EC9 /* HandBrake-64.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "HandBrake-64.icns"; sourceTree = "<group>"; };
+               274DD1E30FEF109900881E69 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = /usr/lib/libiconv.dylib; sourceTree = "<absolute>"; };
                2774BE8F0F66F47100B65FC6 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; };
                2774BE910F66F48200B65FC6 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
                27AC71840F5A0AF600053B83 /* fakexcode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fakexcode.cpp; path = ../test/fakexcode.cpp; sourceTree = SOURCE_ROOT; };
@@ -148,11 +160,11 @@
                29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
                29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
                4D1FD381073D19CE00E46515 /* HBPreviewController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBPreviewController.h; sourceTree = "<group>"; };
-               4D1FD382073D19CE00E46515 /* HBPreviewController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = HBPreviewController.mm; sourceTree = "<group>"; };
+               4D1FD382073D19CE00E46515 /* HBPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBPreviewController.m; sourceTree = "<group>"; };
                4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
                4DEB2024052B055F00C39CA9 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
                4DF3C8CB052889CD00A80101 /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; };
-               4DF3C8CC052889CD00A80101 /* Controller.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = Controller.mm; sourceTree = "<group>"; };
+               4DF3C8CC052889CD00A80101 /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; };
                526FBC760B4CA8F40064E04C /* test.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; name = test.c; path = ../test/test.c; sourceTree = SOURCE_ROOT; };
                593034E90BBA39A100172349 /* ChapterTitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChapterTitles.h; sourceTree = "<group>"; };
                593034EA0BBA39A100172349 /* ChapterTitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChapterTitles.m; sourceTree = "<group>"; };
@@ -161,6 +173,7 @@
                A20F47000EBB5EC2005B861B /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = "<absolute>"; };
                A22C85EA0D05D35000C10E36 /* HBPresets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPresets.h; sourceTree = "<group>"; };
                A22C85EB0D05D35000C10E36 /* HBPresets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPresets.m; sourceTree = "<group>"; };
+               A256080B0FD06720006A4277 /* Brushed_Window.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Brushed_Window.png; path = icons/Brushed_Window.png; sourceTree = "<group>"; };
                A25962E00F15077500B3BF4E /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = /System/Library/Frameworks/Quartz.framework; sourceTree = "<absolute>"; };
                A273E04A0C57B39A00493A45 /* Pause.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Pause.tiff; sourceTree = "<group>"; };
                A273E04B0C57B39A00493A45 /* Play.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Play.tiff; sourceTree = "<group>"; };
@@ -170,8 +183,10 @@
                A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBDVDDetector.h; sourceTree = "<group>"; };
                A2A1EC390C76C58400827E0D /* HBDVDDetector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBDVDDetector.m; sourceTree = "<group>"; };
                A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = "<group>"; };
-               A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureController.mm; sourceTree = "<group>"; };
+               A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PictureController.m; sourceTree = "<group>"; };
                A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
+               A2D18AA50FD81C50003C997B /* HBSubtitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSubtitles.h; sourceTree = "<group>"; };
+               A2D18AA60FD81C50003C997B /* HBSubtitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSubtitles.m; sourceTree = "<group>"; };
                A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = ActivityWindow.tiff; sourceTree = "<group>"; };
                A2D7AD5F0C998AD30082CA33 /* AddToQueue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = AddToQueue.tiff; sourceTree = "<group>"; };
                A2D7AD600C998AD30082CA33 /* Drawer.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Drawer.tiff; sourceTree = "<group>"; };
@@ -182,6 +197,10 @@
                A906A0500F7A7B210007A827 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = "<absolute>"; };
                A9AC41DD0C918DB500DDF9B8 /* HBAdvancedController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBAdvancedController.m; sourceTree = "<group>"; };
                A9AC41DE0C918DB500DDF9B8 /* HBAdvancedController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBAdvancedController.h; sourceTree = "<group>"; };
+               D234BCB91240E82800BE2E98 /* HBAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudio.h; sourceTree = "<group>"; };
+               D234BCBA1240E82800BE2E98 /* HBAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudio.m; sourceTree = "<group>"; };
+               D234BCBB1240E82800BE2E98 /* HBAudioController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudioController.h; sourceTree = "<group>"; };
+               D234BCBC1240E82800BE2E98 /* HBAudioController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioController.m; sourceTree = "<group>"; };
                D289A9F20DBBE7AC00CE614B /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
                E3003C7E0C88505D0072F2A8 /* DeleteHighlightPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeleteHighlightPressed.png; sourceTree = "<group>"; };
                E3003CB40C8852B70072F2A8 /* DeletePressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeletePressed.png; sourceTree = "<group>"; };
@@ -223,11 +242,12 @@
                        buildActionMask = 2147483647;
                        files = (
                                D289A9F30DBBE7AC00CE614B /* CoreServices.framework in Frameworks */,
+                               A906A0520F7A7B210007A827 /* AudioToolbox.framework in Frameworks */,
                                D289AAC40DBBF3F100CE614B /* IOKit.framework in Frameworks */,
                                2713E6300F676510002E0A01 /* libhb.a in Frameworks */,
+                               274DD1E40FEF109900881E69 /* libiconv.dylib in Frameworks */,
                                2774BE900F66F47100B65FC6 /* libbz2.dylib in Frameworks */,
                                2774BE920F66F48200B65FC6 /* libz.dylib in Frameworks */,
-                               A906A0520F7A7B210007A827 /* AudioToolbox.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -239,13 +259,14 @@
                                A25962E10F15077500B3BF4E /* Quartz.framework in Frameworks */,
                                A20F47010EBB5EC2005B861B /* QTKit.framework in Frameworks */,
                                4DD93FA4082036E8008E1322 /* OpenGL.framework in Frameworks */,
+                               A906A0510F7A7B210007A827 /* AudioToolbox.framework in Frameworks */,
                                4DD93FA3082036E8008E1322 /* IOKit.framework in Frameworks */,
                                A29E05800BE1283E000533F5 /* Growl.framework in Frameworks */,
                                A2D0A0AB0D3E5929002D57CB /* Sparkle.framework in Frameworks */,
                                2713E6420F676526002E0A01 /* libhb.a in Frameworks */,
+                               274DD20B0FEF10FD00881E69 /* libiconv.dylib in Frameworks */,
                                2774BEC70F66F61A00B65FC6 /* libbz2.dylib in Frameworks */,
                                2774BEC80F66F61A00B65FC6 /* libz.dylib in Frameworks */,
-                               A906A0510F7A7B210007A827 /* AudioToolbox.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -270,6 +291,7 @@
                                089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
                                29B97323FDCFA39411CA2CEA /* Frameworks */,
                                19C28FACFE9D520D11CA2CBB /* Products */,
+                               274DD1E30FEF109900881E69 /* libiconv.dylib */,
                        );
                        name = HandBrake;
                        sourceTree = "<group>";
@@ -277,9 +299,11 @@
                29B97317FDCFA39411CA2CEA /* Resources */ = {
                        isa = PBXGroup;
                        children = (
+                               A256080B0FD06720006A4277 /* Brushed_Window.png */,
                                A27BB4E80EFAB9310027CDF9 /* PicturePreview.xib */,
                                A273E0460C57B39A00493A45 /* icons */,
                                0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */,
+                               2728D25A0FE8419900758EC9 /* HandBrake-64.icns */,
                                E39AA4DA0D32DC0B0007A415 /* MainMenu.xib */,
                                E39AA4E20D32DC0B0007A415 /* AdvancedView.xib */,
                                E39AA4E40D32DC0B0007A415 /* OutputPanel.xib */,
@@ -325,14 +349,20 @@
                526FBC930B4CAA260064E04C /* HandBrake Sources */ = {
                        isa = PBXGroup;
                        children = (
-                               4DF3C8CC052889CD00A80101 /* Controller.mm */,
+                               D234BCB91240E82800BE2E98 /* HBAudio.h */,
+                               D234BCBA1240E82800BE2E98 /* HBAudio.m */,
+                               D234BCBB1240E82800BE2E98 /* HBAudioController.h */,
+                               D234BCBC1240E82800BE2E98 /* HBAudioController.m */,
+                               A2D18AA50FD81C50003C997B /* HBSubtitles.h */,
+                               A2D18AA60FD81C50003C997B /* HBSubtitles.m */,
+                               4DF3C8CB052889CD00A80101 /* Controller.h */,
+                               4DF3C8CC052889CD00A80101 /* Controller.m */,
                                A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */,
-                               A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */,
+                               A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */,
                                A22C85EA0D05D35000C10E36 /* HBPresets.h */,
                                A22C85EB0D05D35000C10E36 /* HBPresets.m */,
                                4D1FD381073D19CE00E46515 /* HBPreviewController.h */,
-                               4D1FD382073D19CE00E46515 /* HBPreviewController.mm */,
-                               4DF3C8CB052889CD00A80101 /* Controller.h */,
+                               4D1FD382073D19CE00E46515 /* HBPreviewController.m */,
                                593034E90BBA39A100172349 /* ChapterTitles.h */,
                                593034EA0BBA39A100172349 /* ChapterTitles.m */,
                                A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */,
@@ -412,6 +442,9 @@
                                A22C85EC0D05D35000C10E36 /* HBPresets.h in Headers */,
                                A2BEA5FB0F2A1ED1001CE7A1 /* PictureController.h in Headers */,
                                278070240F5C261300699207 /* ChapterTitles.h in Headers */,
+                               A2D18AA70FD81C50003C997B /* HBSubtitles.h in Headers */,
+                               D234BCBD1240E82800BE2E98 /* HBAudio.h in Headers */,
+                               D234BCBF1240E82800BE2E98 /* HBAudioController.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -507,7 +540,14 @@
                        };
                        buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "HandBrake" */;
                        compatibilityVersion = "Xcode 3.1";
+                       developmentRegion = English;
                        hasScannedForEncodings = 1;
+                       knownRegions = (
+                               English,
+                               Japanese,
+                               French,
+                               German,
+                       );
                        mainGroup = 29B97314FDCFA39411CA2CEA /* HandBrake */;
                        projectDirPath = "";
                        projectRoot = "";
@@ -567,6 +607,8 @@
                                E39AA4EA0D32DC0B0007A415 /* AdvancedView.xib in Resources */,
                                E39AA4EB0D32DC0B0007A415 /* OutputPanel.xib in Resources */,
                                A27BB4EA0EFAB9310027CDF9 /* PicturePreview.xib in Resources */,
+                               A256080C0FD06720006A4277 /* Brushed_Window.png in Resources */,
+                               2728D25B0FE8419900758EC9 /* HandBrake-64.icns in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -589,8 +631,8 @@
                        files = (
                                59CBD2650BBB4D1B004A3BE3 /* ChapterTitles.m in Sources */,
                                4DD93F9A082036E8008E1322 /* main.mm in Sources */,
-                               4DD93F9B082036E8008E1322 /* Controller.mm in Sources */,
-                               4DD93F9E082036E8008E1322 /* HBPreviewController.mm in Sources */,
+                               4DD93F9B082036E8008E1322 /* Controller.m in Sources */,
+                               4DD93F9E082036E8008E1322 /* HBPreviewController.m in Sources */,
                                A2A1EC3A0C76C58400827E0D /* HBDVDDetector.m in Sources */,
                                253886020BFE0A5B0064E995 /* HBOutputRedirect.m in Sources */,
                                253886180BFE0C160064E995 /* HBOutputPanelController.m in Sources */,
@@ -599,7 +641,10 @@
                                A9AC41DF0C918DB500DDF9B8 /* HBAdvancedController.m in Sources */,
                                E37172670C977D340072B384 /* HBImageAndTextCell.m in Sources */,
                                A22C85ED0D05D35100C10E36 /* HBPresets.m in Sources */,
-                               A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.mm in Sources */,
+                               A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.m in Sources */,
+                               A2D18AA80FD81C50003C997B /* HBSubtitles.m in Sources */,
+                               D234BCBE1240E82800BE2E98 /* HBAudio.m in Sources */,
+                               D234BCC01240E82800BE2E98 /* HBAudioController.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -689,9 +734,12 @@
                0DFF0C0D0B6BCEE000549488 /* debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
                                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",
@@ -699,7 +747,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -711,6 +760,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;
                        };
@@ -719,9 +769,12 @@
                0DFF0C0E0B6BCEE000549488 /* standard */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
                                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",
@@ -729,7 +782,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -741,6 +795,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;
                        };
@@ -753,10 +808,11 @@
                                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";
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_DYNAMIC_NO_PIC = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = G5;
@@ -786,7 +842,9 @@
                                INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
                                INFOPLIST_PREPROCESS = YES;
                                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",
@@ -794,7 +852,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -806,6 +865,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 = (
@@ -820,9 +880,12 @@
                27B4DEB40F65BAB600098046 /* standard.i386 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
                                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",
@@ -830,7 +893,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -842,6 +906,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;
                        };
@@ -875,10 +940,11 @@
                                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";
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_DYNAMIC_NO_PIC = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = G5;
@@ -908,7 +974,9 @@
                                INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
                                INFOPLIST_PREPROCESS = YES;
                                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",
@@ -916,7 +984,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -928,6 +997,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 = (
@@ -942,9 +1012,12 @@
                27B4DEBA0F65BAB700098046 /* standard.x86_64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
                                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",
@@ -952,7 +1025,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -964,6 +1038,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;
                        };
@@ -997,10 +1072,11 @@
                                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";
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_DYNAMIC_NO_PIC = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = G5;
@@ -1030,7 +1106,9 @@
                                INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
                                INFOPLIST_PREPROCESS = YES;
                                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",
@@ -1038,7 +1116,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -1050,6 +1129,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 = (
@@ -1064,9 +1144,12 @@
                27B4DEC00F65BAB800098046 /* standard.ppc */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
                                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",
@@ -1074,7 +1157,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -1086,6 +1170,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;
                        };
@@ -1119,10 +1204,11 @@
                                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";
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_DYNAMIC_NO_PIC = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = G5;
@@ -1152,7 +1238,9 @@
                                INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
                                INFOPLIST_PREPROCESS = YES;
                                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",
@@ -1160,7 +1248,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -1172,6 +1261,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 = (
@@ -1186,9 +1276,12 @@
                27B4DEC60F65BAB900098046 /* standard.ppc64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
                                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",
@@ -1196,7 +1289,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -1208,6 +1302,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;
                        };
@@ -1243,10 +1338,11 @@
                                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";
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_DYNAMIC_NO_PIC = YES;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_OPTIMIZATION_LEVEL = 0;
@@ -1277,7 +1373,9 @@
                                INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
                                INFOPLIST_PREPROCESS = YES;
                                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",
@@ -1285,7 +1383,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -1297,6 +1396,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 = (
@@ -1311,9 +1411,12 @@
                27B4DECC0F65BABC00098046 /* debug.i386 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
                                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",
@@ -1321,7 +1424,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -1333,6 +1437,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;
                        };
@@ -1368,10 +1473,11 @@
                                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";
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_DYNAMIC_NO_PIC = YES;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_OPTIMIZATION_LEVEL = 0;
@@ -1402,7 +1508,9 @@
                                INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
                                INFOPLIST_PREPROCESS = YES;
                                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",
@@ -1410,7 +1518,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -1422,6 +1531,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 = (
@@ -1436,9 +1546,12 @@
                27B4DED20F65BABD00098046 /* debug.x86_64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
                                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",
@@ -1446,7 +1559,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -1458,6 +1572,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;
                        };
@@ -1493,10 +1608,11 @@
                                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";
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_DYNAMIC_NO_PIC = YES;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_OPTIMIZATION_LEVEL = 0;
@@ -1527,7 +1643,9 @@
                                INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
                                INFOPLIST_PREPROCESS = YES;
                                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",
@@ -1535,7 +1653,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -1547,6 +1666,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 = (
@@ -1561,9 +1681,12 @@
                27B4DED80F65BABD00098046 /* debug.ppc */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
                                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",
@@ -1571,7 +1694,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -1583,6 +1707,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;
                        };
@@ -1618,10 +1743,11 @@
                                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";
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_DYNAMIC_NO_PIC = YES;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_OPTIMIZATION_LEVEL = 0;
@@ -1652,7 +1778,9 @@
                                INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
                                INFOPLIST_PREPROCESS = YES;
                                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",
@@ -1660,7 +1788,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -1672,6 +1801,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 = (
@@ -1686,9 +1816,12 @@
                27B4DEDE0F65BABD00098046 /* debug.ppc64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
                                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",
@@ -1696,7 +1829,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -1708,6 +1842,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;
                        };
@@ -1786,7 +1921,9 @@
                                INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
                                INFOPLIST_PREPROCESS = YES;
                                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",
@@ -1794,7 +1931,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -1806,6 +1944,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 = (
@@ -1827,7 +1966,9 @@
                                INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
                                INFOPLIST_PREPROCESS = YES;
                                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",
@@ -1835,7 +1976,8 @@
                                        "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
                                        "$(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",
@@ -1847,6 +1989,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 = (
@@ -1866,10 +2009,11 @@
                                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";
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_DYNAMIC_NO_PIC = YES;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_OPTIMIZATION_LEVEL = 0;
@@ -1896,10 +2040,11 @@
                                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";
+                               GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_DYNAMIC_NO_PIC = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = G5;