OSDN Git Service

bump ffmpeg from git-185a155 to git-0b32da9
[handbrake-jp/handbrake-jp-git.git] / macosx / HandBrake.xcodeproj / project.pbxproj
index 0ce0e89..4a20105 100644 (file)
        archiveVersion = 1;
        classes = {
        };
-       objectVersion = 42;
+       objectVersion = 45;
        objects = {
 
 /* Begin PBXBuildFile section */
-               0D096E010B707D3400A845D4 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9B0B4CAB100064E04C /* common.c */; };
-               0D096E020B707D3400A845D4 /* deca52.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9D0B4CAB100064E04C /* deca52.c */; };
-               0D096E030B707D3400A845D4 /* decavcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9E0B4CAB100064E04C /* decavcodec.c */; };
-               0D096EA30B70884A00A845D4 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D1125D709D72FD200E0657B /* libz.dylib */; };
-               0DF377980B7BF99A00115CB0 /* fakexcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DF377970B7BF99A00115CB0 /* fakexcode.cpp */; };
                0DFA5C7B0B8DD1E90020BC09 /* HandBrake.icns in Resources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */; };
-               0DFA5CC00B8DD3FE0020BC09 /* declpcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */; };
-               0DFA5CC10B8DD3FE0020BC09 /* decmpeg2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7F0B8DD3B60020BC09 /* decmpeg2.c */; };
-               0DFA5CC20B8DD3FE0020BC09 /* decsub.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C800B8DD3B60020BC09 /* decsub.c */; };
-               0DFA5CC30B8DD3FE0020BC09 /* demuxmpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C810B8DD3B60020BC09 /* demuxmpeg.c */; };
-               0DFA5CC40B8DD3FE0020BC09 /* dvd.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C820B8DD3B60020BC09 /* dvd.c */; };
-               0DFA5CC50B8DD3FE0020BC09 /* encavcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C830B8DD3B60020BC09 /* encavcodec.c */; };
-               0DFA5CC60B8DD3FE0020BC09 /* encfaac.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C840B8DD3B60020BC09 /* encfaac.c */; };
-               0DFA5CC70B8DD3FE0020BC09 /* enclame.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C850B8DD3B60020BC09 /* enclame.c */; };
-               0DFA5CC80B8DD3FE0020BC09 /* encvorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C860B8DD3B60020BC09 /* encvorbis.c */; };
-               0DFA5CC90B8DD3FE0020BC09 /* encx264.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C870B8DD3B60020BC09 /* encx264.c */; };
-               0DFA5CCA0B8DD3FE0020BC09 /* encxvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C880B8DD3B60020BC09 /* encxvid.c */; };
-               0DFA5CCB0B8DD3FE0020BC09 /* fifo.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C890B8DD3B60020BC09 /* fifo.c */; };
-               0DFA5CCC0B8DD3FE0020BC09 /* hb.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8A0B8DD3B60020BC09 /* hb.c */; };
-               0DFA5CCD0B8DD3FE0020BC09 /* ipodutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */; };
-               0DFA5CCE0B8DD3FE0020BC09 /* muxavi.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C910B8DD3B60020BC09 /* muxavi.c */; };
-               0DFA5CCF0B8DD3FE0020BC09 /* muxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C920B8DD3B60020BC09 /* muxcommon.c */; };
-               0DFA5CD00B8DD3FE0020BC09 /* muxmp4.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C930B8DD3B60020BC09 /* muxmp4.c */; };
-               0DFA5CD10B8DD3FE0020BC09 /* muxogm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C940B8DD3B60020BC09 /* muxogm.c */; };
-               0DFA5CD20B8DD3FE0020BC09 /* ports.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C950B8DD3B60020BC09 /* ports.c */; };
-               0DFA5CD30B8DD3FE0020BC09 /* reader.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C970B8DD3B60020BC09 /* reader.c */; };
-               0DFA5CD40B8DD3FE0020BC09 /* render.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C980B8DD3B60020BC09 /* render.c */; };
-               0DFA5CD50B8DD3FE0020BC09 /* scan.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C990B8DD3B60020BC09 /* scan.c */; };
-               0DFA5CD60B8DD3FE0020BC09 /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9A0B8DD3B60020BC09 /* sync.c */; };
-               0DFA5CD70B8DD3FE0020BC09 /* update.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9B0B8DD3B60020BC09 /* update.c */; };
-               0DFA5CD80B8DD3FE0020BC09 /* work.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9C0B8DD3B60020BC09 /* work.c */; };
-               0DFA5CD90B8DD4210020BC09 /* declpcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */; };
-               0DFA5CDA0B8DD4210020BC09 /* decmpeg2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7F0B8DD3B60020BC09 /* decmpeg2.c */; };
-               0DFA5CDB0B8DD4210020BC09 /* decsub.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C800B8DD3B60020BC09 /* decsub.c */; };
-               0DFA5CDC0B8DD4210020BC09 /* demuxmpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C810B8DD3B60020BC09 /* demuxmpeg.c */; };
-               0DFA5CDD0B8DD4210020BC09 /* dvd.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C820B8DD3B60020BC09 /* dvd.c */; };
-               0DFA5CDE0B8DD4210020BC09 /* encavcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C830B8DD3B60020BC09 /* encavcodec.c */; };
-               0DFA5CDF0B8DD4210020BC09 /* encfaac.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C840B8DD3B60020BC09 /* encfaac.c */; };
-               0DFA5CE00B8DD4210020BC09 /* enclame.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C850B8DD3B60020BC09 /* enclame.c */; };
-               0DFA5CE10B8DD4210020BC09 /* encvorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C860B8DD3B60020BC09 /* encvorbis.c */; };
-               0DFA5CE20B8DD4210020BC09 /* encx264.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C870B8DD3B60020BC09 /* encx264.c */; };
-               0DFA5CE30B8DD4210020BC09 /* encxvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C880B8DD3B60020BC09 /* encxvid.c */; };
-               0DFA5CE40B8DD4210020BC09 /* fifo.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C890B8DD3B60020BC09 /* fifo.c */; };
-               0DFA5CE50B8DD4210020BC09 /* hb.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8A0B8DD3B60020BC09 /* hb.c */; };
-               0DFA5CE60B8DD4210020BC09 /* ipodutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */; };
-               0DFA5CE70B8DD4210020BC09 /* muxavi.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C910B8DD3B60020BC09 /* muxavi.c */; };
-               0DFA5CE80B8DD4210020BC09 /* muxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C920B8DD3B60020BC09 /* muxcommon.c */; };
-               0DFA5CE90B8DD4210020BC09 /* muxmp4.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C930B8DD3B60020BC09 /* muxmp4.c */; };
-               0DFA5CEA0B8DD4210020BC09 /* muxogm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C940B8DD3B60020BC09 /* muxogm.c */; };
-               0DFA5CEB0B8DD4210020BC09 /* ports.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C950B8DD3B60020BC09 /* ports.c */; };
-               0DFA5CEC0B8DD4210020BC09 /* reader.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C970B8DD3B60020BC09 /* reader.c */; };
-               0DFA5CED0B8DD4210020BC09 /* render.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C980B8DD3B60020BC09 /* render.c */; };
-               0DFA5CEE0B8DD4210020BC09 /* scan.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C990B8DD3B60020BC09 /* scan.c */; };
-               0DFA5CEF0B8DD4210020BC09 /* sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9A0B8DD3B60020BC09 /* sync.c */; };
-               0DFA5CF00B8DD4210020BC09 /* update.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9B0B8DD3B60020BC09 /* update.c */; };
-               0DFA5CF10B8DD4210020BC09 /* work.c in Sources */ = {isa = PBXBuildFile; fileRef = 0DFA5C9C0B8DD3B60020BC09 /* work.c */; };
-               0DFA5CF80B8DD7B40020BC09 /* HandBrake.icns in Resources */ = {isa = PBXBuildFile; fileRef = 0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */; };
-               0DFA5D070B8DD9040020BC09 /* HandBrake.plist in Resources */ = {isa = PBXBuildFile; fileRef = 0DFA5D060B8DD9040020BC09 /* HandBrake.plist */; };
-               0DFF0B770B6BC72A00549488 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9B0B4CAB100064E04C /* common.c */; };
-               0DFF0B790B6BC72A00549488 /* deca52.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9D0B4CAB100064E04C /* deca52.c */; };
-               0DFF0B7A0B6BC72A00549488 /* decavcodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC9E0B4CAB100064E04C /* decavcodec.c */; };
                0DFF0C100B6BCEE800549488 /* test.c in Sources */ = {isa = PBXBuildFile; fileRef = 526FBC760B4CA8F40064E04C /* test.c */; };
                253886010BFE0A5B0064E995 /* HBOutputRedirect.h in Headers */ = {isa = PBXBuildFile; fileRef = 253885FF0BFE0A5B0064E995 /* HBOutputRedirect.h */; };
                253886020BFE0A5B0064E995 /* HBOutputRedirect.m in Sources */ = {isa = PBXBuildFile; fileRef = 253886000BFE0A5B0064E995 /* HBOutputRedirect.m */; };
-               2538860C0BFE0B730064E995 /* OutputPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2538860A0BFE0B730064E995 /* OutputPanel.nib */; };
                253886170BFE0C160064E995 /* HBOutputPanelController.h in Headers */ = {isa = PBXBuildFile; fileRef = 253886150BFE0C160064E995 /* HBOutputPanelController.h */; };
                253886180BFE0C160064E995 /* HBOutputPanelController.m in Sources */ = {isa = PBXBuildFile; fileRef = 253886160BFE0C160064E995 /* HBOutputPanelController.m */; };
-               25DE1FAD0C1699E500F01FC8 /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 25DE1FAB0C1699E500F01FC8 /* Preferences.nib */; };
                25DE1FB60C169A0C00F01FC8 /* HBPreferencesController.h in Headers */ = {isa = PBXBuildFile; fileRef = 25DE1FB40C169A0C00F01FC8 /* HBPreferencesController.h */; };
                25DE1FB70C169A0C00F01FC8 /* HBPreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 25DE1FB50C169A0C00F01FC8 /* HBPreferencesController.m */; };
-               4D1125D809D72FD200E0657B /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D1125D709D72FD200E0657B /* libz.dylib */; };
-               4D1125D909D72FD200E0657B /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D1125D709D72FD200E0657B /* libz.dylib */; };
-               4D1EA2EA0993B09A00FDC1A2 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; };
-               4D1EA2F60993B0CA00FDC1A2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-               4D1EA3010993B13700FDC1A2 /* Express.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4D1EA3000993B13700FDC1A2 /* Express.nib */; };
-               4D1EA31C0993B24700FDC1A2 /* ExpressController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1EA31B0993B24700FDC1A2 /* ExpressController.m */; };
-               4D2AEA1A09CCB332007E18F6 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DEB2024052B055F00C39CA9 /* IOKit.framework */; };
-               4D3ECC2709A4917000B2E45F /* WhiteBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D3ECC2609A4917000B2E45F /* WhiteBox.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 */; };
+               2774BEC80F66F61A00B65FC6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2774BE910F66F48200B65FC6 /* libz.dylib */; };
+               278070240F5C261300699207 /* ChapterTitles.h in Headers */ = {isa = PBXBuildFile; fileRef = 593034E90BBA39A100172349 /* ChapterTitles.h */; };
+               27AC71850F5A0AF600053B83 /* fakexcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27AC71840F5A0AF600053B83 /* fakexcode.cpp */; };
                4DD93F8F082036E8008E1322 /* Controller.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DF3C8CB052889CD00A80101 /* Controller.h */; };
-               4DD93F90082036E8008E1322 /* PictureGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D85758F052B78E300C39CA9 /* PictureGLView.h */; };
-               4DD93F92082036E8008E1322 /* PictureController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D1FD381073D19CE00E46515 /* PictureController.h */; };
-               4DD93F96082036E8008E1322 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
+               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 */; };
-               4DD93F9C082036E8008E1322 /* PictureGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4D85758E052B78E300C39CA9 /* PictureGLView.mm */; };
-               4DD93F9E082036E8008E1322 /* PictureController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4D1FD382073D19CE00E46515 /* PictureController.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 */; };
-               52AFF86A0B59BD07000DA7C4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
-               52AFF86B0B59BD14000DA7C4 /* Express.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4D1EA2DC0993B01000FDC1A2 /* Express.plist */; };
-               5558B5690BE3BADF00E15E27 /* decdca.c in Sources */ = {isa = PBXBuildFile; fileRef = 5558B5680BE3BADF00E15E27 /* decdca.c */; };
-               5558B56A0BE3BADF00E15E27 /* decdca.c in Sources */ = {isa = PBXBuildFile; fileRef = 5558B5680BE3BADF00E15E27 /* decdca.c */; };
-               593034EB0BBA39A100172349 /* ChapterTitles.h in Headers */ = {isa = PBXBuildFile; fileRef = 593034E90BBA39A100172349 /* ChapterTitles.h */; };
-               593034EC0BBA39A100172349 /* ChapterTitles.m in Sources */ = {isa = PBXBuildFile; fileRef = 593034EA0BBA39A100172349 /* ChapterTitles.m */; };
                59CBD2370BBB44DA004A3BE3 /* parsecsv.c in Sources */ = {isa = PBXBuildFile; fileRef = 59CBD2360BBB44DA004A3BE3 /* parsecsv.c */; };
                59CBD2650BBB4D1B004A3BE3 /* ChapterTitles.m in Sources */ = {isa = PBXBuildFile; fileRef = 593034EA0BBA39A100172349 /* ChapterTitles.m */; };
-               A2122D820C7EAF6600AB87A4 /* DriveDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = A2122D810C7EAF6600AB87A4 /* DriveDetector.m */; };
-               A273E04E0C57B39A00493A45 /* Add.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E0470C57B39A00493A45 /* Add.tiff */; };
-               A273E04F0C57B39A00493A45 /* Brushed Window.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E0480C57B39A00493A45 /* Brushed Window.tiff */; };
-               A273E0500C57B39A00493A45 /* Drawer-List2.png in Resources */ = {isa = PBXBuildFile; fileRef = A273E0490C57B39A00493A45 /* Drawer-List2.png */; };
+               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 */; };
                A273E0530C57B39A00493A45 /* Stop.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04C0C57B39A00493A45 /* Stop.tiff */; };
-               A273E0540C57B39A00493A45 /* Terminal.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04D0C57B39A00493A45 /* Terminal.tiff */; };
-               A273E09A0C57C1CC00493A45 /* muxmkv.c in Sources */ = {isa = PBXBuildFile; fileRef = A273E0950C57C19500493A45 /* muxmkv.c */; };
-               A273E09B0C57C1CD00493A45 /* muxmkv.c in Sources */ = {isa = PBXBuildFile; fileRef = A273E0950C57C19500493A45 /* muxmkv.c */; };
-               A28468680C5A43D900EF9A98 /* Disc.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A28468670C5A43D900EF9A98 /* Disc.tiff */; };
+               A27BB4EA0EFAB9310027CDF9 /* PicturePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = A27BB4E80EFAB9310027CDF9 /* PicturePreview.xib */; };
                A29E05800BE1283E000533F5 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A29E057F0BE1283E000533F5 /* Growl.framework */; };
                A29E058B0BE12889000533F5 /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A29E057F0BE1283E000533F5 /* Growl.framework */; };
                A2A1EC310C76C35E00827E0D /* HBDVDDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */; };
                A2A1EC3A0C76C58400827E0D /* HBDVDDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A1EC390C76C58400827E0D /* HBDVDDetector.m */; };
-               A2DFC66E0C6196D900E66E89 /* actionWidget.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DFC66C0C6196D900E66E89 /* actionWidget.png */; };
-               A2DFC66F0C6196D900E66E89 /* actionWidgetPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DFC66D0C6196D900E66E89 /* actionWidgetPressed.png */; };
-               A2DFC6750C6197C600E66E89 /* MVMenuButton.h in Headers */ = {isa = PBXBuildFile; fileRef = A2DFC6740C6197C600E66E89 /* MVMenuButton.h */; };
-               A2DFC6770C61980700E66E89 /* MVMenuButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A2DFC6760C61980700E66E89 /* MVMenuButton.m */; };
-               A97A1DB40C91A6800015BC08 /* Express.nib in Resources */ = {isa = PBXBuildFile; fileRef = A97A1DB20C91A6800015BC08 /* Express.nib */; };
+               A2BEA5FB0F2A1ED1001CE7A1 /* PictureController.h in Headers */ = {isa = PBXBuildFile; fileRef = A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */; };
+               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 */; };
+               A2D7AD6B0C998AD30082CA33 /* pref-audio.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD620C998AD30082CA33 /* pref-audio.tiff */; };
+               A2D7AD6D0C998AD30082CA33 /* pref-picture.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD640C998AD30082CA33 /* pref-picture.tiff */; };
+               A2D7AD6E0C998AD30082CA33 /* Queue.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD650C998AD30082CA33 /* Queue.tiff */; };
+               A2D7AD6F0C998AD30082CA33 /* Source.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD660C998AD30082CA33 /* Source.tiff */; };
+               A906A0510F7A7B210007A827 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A906A0500F7A7B210007A827 /* AudioToolbox.framework */; };
+               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 */; };
-               A9AC41E70C918DC000DDF9B8 /* AdvancedView.nib in Resources */ = {isa = PBXBuildFile; fileRef = A9AC41E50C918DC000DDF9B8 /* AdvancedView.nib */; };
-               B48359A80C82960500E04440 /* lang.c in Sources */ = {isa = PBXBuildFile; fileRef = B48359A70C82960500E04440 /* lang.c */; };
-               D4D49FED0C83355600F01215 /* lang.c in Sources */ = {isa = PBXBuildFile; fileRef = B48359A70C82960500E04440 /* lang.c */; };
+               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 */; };
                E3003CB50C8852B70072F2A8 /* DeletePressed.png in Resources */ = {isa = PBXBuildFile; fileRef = E3003CB40C8852B70072F2A8 /* DeletePressed.png */; };
-               E30EC7730C90BDD0004B9545 /* Encodes.png in Resources */ = {isa = PBXBuildFile; fileRef = E30EC76F0C90BDD0004B9545 /* Encodes.png */; };
-               E30EC7740C90BDD0004B9545 /* PassesPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = E30EC7700C90BDD0004B9545 /* PassesPressed.png */; };
-               E30EC7750C90BDD0004B9545 /* Passes.png in Resources */ = {isa = PBXBuildFile; fileRef = E30EC7710C90BDD0004B9545 /* Passes.png */; };
-               E30EC7760C90BDD0004B9545 /* EncodesPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = E30EC7720C90BDD0004B9545 /* EncodesPressed.png */; };
-               E318F0470C90D6D3003EFB59 /* JobPassLarge.png in Resources */ = {isa = PBXBuildFile; fileRef = E318F0460C90D6D3003EFB59 /* JobPassLarge.png */; };
-               E318F0580C90D88C003EFB59 /* JobPassSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = E318F0570C90D88C003EFB59 /* JobPassSmall.png */; };
-               E318F0830C90DC4A003EFB59 /* Info.png in Resources */ = {isa = PBXBuildFile; fileRef = E318F0820C90DC4A003EFB59 /* Info.png */; };
+               E37167890C92F6180072B384 /* JobPassSecondSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = E37167830C92F6180072B384 /* JobPassSecondSmall.png */; };
+               E371678A0C92F6180072B384 /* JobPassSubtitleSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = E37167840C92F6180072B384 /* JobPassSubtitleSmall.png */; };
+               E371678B0C92F6180072B384 /* JobPassFirstSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = E37167850C92F6180072B384 /* JobPassFirstSmall.png */; };
+               E37167A90C92FAA50072B384 /* JobPassUnknownSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = E37167A70C92FAA50072B384 /* JobPassUnknownSmall.png */; };
+               E37172670C977D340072B384 /* HBImageAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E37172650C977D340072B384 /* HBImageAndTextCell.m */; };
+               E37172680C977D340072B384 /* HBImageAndTextCell.h in Headers */ = {isa = PBXBuildFile; fileRef = E37172660C977D340072B384 /* HBImageAndTextCell.h */; };
                E37C89410C83988F00C1B919 /* DeleteHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = E37C893D0C83988F00C1B919 /* DeleteHighlight.png */; };
                E37C89420C83988F00C1B919 /* Delete.png in Resources */ = {isa = PBXBuildFile; fileRef = E37C893E0C83988F00C1B919 /* Delete.png */; };
                E37C89430C83988F00C1B919 /* JobSmall.png in Resources */ = {isa = PBXBuildFile; fileRef = E37C893F0C83988F00C1B919 /* JobSmall.png */; };
                E37C89440C83988F00C1B919 /* JobLarge.png in Resources */ = {isa = PBXBuildFile; fileRef = E37C89400C83988F00C1B919 /* JobLarge.png */; };
                E37C89470C83989F00C1B919 /* HBQueueController.mm in Sources */ = {isa = PBXBuildFile; fileRef = E37C89450C83989F00C1B919 /* HBQueueController.mm */; };
                E37C89480C83989F00C1B919 /* HBQueueController.h in Headers */ = {isa = PBXBuildFile; fileRef = E37C89460C83989F00C1B919 /* HBQueueController.h */; };
-               E37C894F0C8398CF00C1B919 /* Queue.nib in Resources */ = {isa = PBXBuildFile; fileRef = E37C894D0C8398CF00C1B919 /* Queue.nib */; };
-               EAA526930C3B25D200944FF2 /* stream.c in Sources */ = {isa = PBXBuildFile; fileRef = EAA526920C3B25D200944FF2 /* stream.c */; };
-               EAA526940C3B25D200944FF2 /* stream.c in Sources */ = {isa = PBXBuildFile; fileRef = EAA526920C3B25D200944FF2 /* stream.c */; };
-               FC8519500C59A02C0073812C /* denoise.c in Sources */ = {isa = PBXBuildFile; fileRef = FC85194C0C59A02C0073812C /* denoise.c */; };
-               FC8519510C59A02C0073812C /* deinterlace.c in Sources */ = {isa = PBXBuildFile; fileRef = FC85194D0C59A02C0073812C /* deinterlace.c */; };
-               FC8519520C59A02C0073812C /* deblock.c in Sources */ = {isa = PBXBuildFile; fileRef = FC85194E0C59A02C0073812C /* deblock.c */; };
-               FC8519530C59A02C0073812C /* detelecine.c in Sources */ = {isa = PBXBuildFile; fileRef = FC85194F0C59A02C0073812C /* detelecine.c */; };
-               FC8519540C59A02C0073812C /* denoise.c in Sources */ = {isa = PBXBuildFile; fileRef = FC85194C0C59A02C0073812C /* denoise.c */; };
-               FC8519550C59A02C0073812C /* deinterlace.c in Sources */ = {isa = PBXBuildFile; fileRef = FC85194D0C59A02C0073812C /* deinterlace.c */; };
-               FC8519560C59A02C0073812C /* deblock.c in Sources */ = {isa = PBXBuildFile; fileRef = FC85194E0C59A02C0073812C /* deblock.c */; };
-               FC8519570C59A02C0073812C /* detelecine.c in Sources */ = {isa = PBXBuildFile; fileRef = FC85194F0C59A02C0073812C /* detelecine.c */; };
+               E3997A2C0CAB58BC00287239 /* EncodeWorking3.png in Resources */ = {isa = PBXBuildFile; fileRef = E3997A260CAB58BC00287239 /* EncodeWorking3.png */; };
+               E3997A2D0CAB58BC00287239 /* EncodeWorking4.png in Resources */ = {isa = PBXBuildFile; fileRef = E3997A270CAB58BC00287239 /* EncodeWorking4.png */; };
+               E3997A2E0CAB58BC00287239 /* EncodeWorking1.png in Resources */ = {isa = PBXBuildFile; fileRef = E3997A280CAB58BC00287239 /* EncodeWorking1.png */; };
+               E3997A2F0CAB58BC00287239 /* EncodeWorking0.png in Resources */ = {isa = PBXBuildFile; fileRef = E3997A290CAB58BC00287239 /* EncodeWorking0.png */; };
+               E3997A300CAB58BC00287239 /* EncodeWorking2.png in Resources */ = {isa = PBXBuildFile; fileRef = E3997A2A0CAB58BC00287239 /* EncodeWorking2.png */; };
+               E3997A310CAB58BC00287239 /* EncodeWorking5.png in Resources */ = {isa = PBXBuildFile; fileRef = E3997A2B0CAB58BC00287239 /* EncodeWorking5.png */; };
+               E39AA4E60D32DC0B0007A415 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = E39AA4DA0D32DC0B0007A415 /* MainMenu.xib */; };
+               E39AA4E70D32DC0B0007A415 /* Queue.xib in Resources */ = {isa = PBXBuildFile; fileRef = E39AA4DC0D32DC0B0007A415 /* Queue.xib */; };
+               E39AA4E80D32DC0B0007A415 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = E39AA4DE0D32DC0B0007A415 /* Preferences.xib */; };
+               E39AA4E90D32DC0B0007A415 /* PictureSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = E39AA4E00D32DC0B0007A415 /* PictureSettings.xib */; };
+               E39AA4EA0D32DC0B0007A415 /* AdvancedView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E39AA4E20D32DC0B0007A415 /* AdvancedView.xib */; };
+               E39AA4EB0D32DC0B0007A415 /* OutputPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = E39AA4E40D32DC0B0007A415 /* OutputPanel.xib */; };
+               E3C844F60CA6B3F90013B683 /* RevealPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = E3C844F20CA6B3F90013B683 /* RevealPressed.png */; };
+               E3C844F70CA6B3F90013B683 /* RevealHighlightPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = E3C844F30CA6B3F90013B683 /* RevealHighlightPressed.png */; };
+               E3C844F80CA6B3F90013B683 /* RevealHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = E3C844F40CA6B3F90013B683 /* RevealHighlight.png */; };
+               E3C844F90CA6B3F90013B683 /* Reveal.png in Resources */ = {isa = PBXBuildFile; fileRef = E3C844F50CA6B3F90013B683 /* Reveal.png */; };
+               E3C845870CA6E9080013B683 /* EncodeComplete.png in Resources */ = {isa = PBXBuildFile; fileRef = E3C845860CA6E9080013B683 /* EncodeComplete.png */; };
+               E3FC10910D1611EC00470E7B /* EncodeCanceled.png in Resources */ = {isa = PBXBuildFile; fileRef = E3FC10900D1611EC00470E7B /* EncodeCanceled.png */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-               0D6E35900B6BD5FA005AABB3 /* PBXContainerItemProxy */ = {
+               277C2E530F5DFF400067D708 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 0DFF0B710B6BC6E600549488;
-                       remoteInfo = libmediafork;
+                       remoteGlobalIDString = 27F143770F5DF34F00A684FF;
+                       remoteInfo = external;
                };
-               0DFF0BF10B6BCCB400549488 /* PBXContainerItemProxy */ = {
+               277C2E550F5DFF450067D708 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
                        proxyType = 1;
-                       remoteGlobalIDString = 0DFF0B710B6BC6E600549488;
-                       remoteInfo = libmediafork;
-               };
-               0DFF0BF30B6BCCB900549488 /* PBXContainerItemProxy */ = {
-                       isa = PBXContainerItemProxy;
-                       containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
-                       proxyType = 1;
-                       remoteGlobalIDString = 0DFF0B710B6BC6E600549488;
-                       remoteInfo = libmediafork;
+                       remoteGlobalIDString = 27F143770F5DF34F00A684FF;
+                       remoteInfo = external;
                };
 /* End PBXContainerItemProxy section */
 
                        dstSubfolderSpec = 10;
                        files = (
                                A29E058B0BE12889000533F5 /* Growl.framework in CopyFiles */,
+                               A2D0A0BF0D3E596F002D57CB /* Sparkle.framework in CopyFiles */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 
 /* Begin PBXFileReference section */
                089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-               0D096DFF0B707D1200A845D4 /* libhb.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libhb.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-               0D6E35760B6BD4F0005AABB3 /* HandBrake.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = HandBrake.app; sourceTree = BUILT_PRODUCTS_DIR; };
-               0DF377970B7BF99A00115CB0 /* fakexcode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = fakexcode.cpp; path = ../test/fakexcode.cpp; sourceTree = SOURCE_ROOT; };
+               0D6E35760B6BD4F0005AABB3 /* HandBrake.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HandBrake.app; sourceTree = BUILT_PRODUCTS_DIR; };
                0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HandBrake.icns; sourceTree = "<group>"; };
-               0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = declpcm.c; path = ../libhb/declpcm.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C7F0B8DD3B60020BC09 /* decmpeg2.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = decmpeg2.c; path = ../libhb/decmpeg2.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C800B8DD3B60020BC09 /* decsub.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = decsub.c; path = ../libhb/decsub.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C810B8DD3B60020BC09 /* demuxmpeg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = demuxmpeg.c; path = ../libhb/demuxmpeg.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C820B8DD3B60020BC09 /* dvd.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dvd.c; path = ../libhb/dvd.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C830B8DD3B60020BC09 /* encavcodec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encavcodec.c; path = ../libhb/encavcodec.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C840B8DD3B60020BC09 /* encfaac.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encfaac.c; path = ../libhb/encfaac.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C850B8DD3B60020BC09 /* enclame.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = enclame.c; path = ../libhb/enclame.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C860B8DD3B60020BC09 /* encvorbis.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encvorbis.c; path = ../libhb/encvorbis.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C870B8DD3B60020BC09 /* encx264.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encx264.c; path = ../libhb/encx264.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C880B8DD3B60020BC09 /* encxvid.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = encxvid.c; path = ../libhb/encxvid.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C890B8DD3B60020BC09 /* fifo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fifo.c; path = ../libhb/fifo.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C8A0B8DD3B60020BC09 /* hb.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hb.c; path = ../libhb/hb.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ipodutil.cpp; path = ../libhb/ipodutil.cpp; sourceTree = SOURCE_ROOT; };
-               0DFA5C910B8DD3B60020BC09 /* muxavi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxavi.c; path = ../libhb/muxavi.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C920B8DD3B60020BC09 /* muxcommon.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxcommon.c; path = ../libhb/muxcommon.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C930B8DD3B60020BC09 /* muxmp4.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxmp4.c; path = ../libhb/muxmp4.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C940B8DD3B60020BC09 /* muxogm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxogm.c; path = ../libhb/muxogm.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C950B8DD3B60020BC09 /* ports.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ports.c; path = ../libhb/ports.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C970B8DD3B60020BC09 /* reader.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = reader.c; path = ../libhb/reader.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C980B8DD3B60020BC09 /* render.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = render.c; path = ../libhb/render.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C990B8DD3B60020BC09 /* scan.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = scan.c; path = ../libhb/scan.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C9A0B8DD3B60020BC09 /* sync.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sync.c; path = ../libhb/sync.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C9B0B8DD3B60020BC09 /* update.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = update.c; path = ../libhb/update.c; sourceTree = SOURCE_ROOT; };
-               0DFA5C9C0B8DD3B60020BC09 /* work.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = work.c; path = ../libhb/work.c; sourceTree = SOURCE_ROOT; };
-               0DFA5D060B8DD9040020BC09 /* HandBrake.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = HandBrake.plist; sourceTree = "<group>"; };
-               0DFF0B720B6BC6E600549488 /* libhb.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhb.a; sourceTree = BUILT_PRODUCTS_DIR; };
                0DFF0C0A0B6BCEC200549488 /* HandBrakeCLI */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = HandBrakeCLI; sourceTree = BUILT_PRODUCTS_DIR; };
                1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
                253885FF0BFE0A5B0064E995 /* HBOutputRedirect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBOutputRedirect.h; sourceTree = "<group>"; };
                253886000BFE0A5B0064E995 /* HBOutputRedirect.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBOutputRedirect.m; sourceTree = "<group>"; };
-               2538860B0BFE0B730064E995 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/OutputPanel.nib; sourceTree = "<group>"; };
                253886150BFE0C160064E995 /* HBOutputPanelController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBOutputPanelController.h; sourceTree = "<group>"; };
                253886160BFE0C160064E995 /* HBOutputPanelController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBOutputPanelController.m; sourceTree = "<group>"; };
-               25DE1FAC0C1699E500F01FC8 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Preferences.nib; sourceTree = "<group>"; };
                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; };
                29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
-               29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
                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>"; };
-               4D1125D709D72FD200E0657B /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
-               4D1EA2DA0993B01000FDC1A2 /* Instant HandBrake.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Instant HandBrake.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-               4D1EA2DC0993B01000FDC1A2 /* Express.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Express.plist; sourceTree = "<group>"; };
-               4D1EA3000993B13700FDC1A2 /* Express.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Express.nib; path = English.lproj/Express.nib; sourceTree = "<group>"; };
-               4D1EA31A0993B24700FDC1A2 /* ExpressController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ExpressController.h; sourceTree = "<group>"; };
-               4D1EA31B0993B24700FDC1A2 /* ExpressController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ExpressController.m; sourceTree = "<group>"; };
-               4D1FD381073D19CE00E46515 /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = "<group>"; };
-               4D1FD382073D19CE00E46515 /* PictureController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureController.mm; sourceTree = "<group>"; };
-               4D3ECC2509A4917000B2E45F /* WhiteBox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WhiteBox.h; sourceTree = "<group>"; };
-               4D3ECC2609A4917000B2E45F /* WhiteBox.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = WhiteBox.m; sourceTree = "<group>"; };
-               4D85758E052B78E300C39CA9 /* PictureGLView.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureGLView.mm; sourceTree = "<group>"; };
-               4D85758F052B78E300C39CA9 /* PictureGLView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PictureGLView.h; sourceTree = "<group>"; };
+               4D1FD381073D19CE00E46515 /* HBPreviewController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBPreviewController.h; 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; };
-               526FBC9B0B4CAB100064E04C /* common.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = common.c; path = ../libhb/common.c; sourceTree = SOURCE_ROOT; };
-               526FBC9D0B4CAB100064E04C /* deca52.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = deca52.c; path = ../libhb/deca52.c; sourceTree = SOURCE_ROOT; };
-               526FBC9E0B4CAB100064E04C /* decavcodec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = decavcodec.c; path = ../libhb/decavcodec.c; sourceTree = SOURCE_ROOT; };
-               5558B5680BE3BADF00E15E27 /* decdca.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = decdca.c; path = ../libhb/decdca.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>"; };
                59CBD2360BBB44DA004A3BE3 /* parsecsv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = parsecsv.c; path = ../test/parsecsv.c; sourceTree = SOURCE_ROOT; };
-               A2122D800C7EAF6500AB87A4 /* DriveDetector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DriveDetector.h; sourceTree = "<group>"; };
-               A2122D810C7EAF6600AB87A4 /* DriveDetector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = DriveDetector.m; sourceTree = "<group>"; };
-               A273E0470C57B39A00493A45 /* Add.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Add.tiff; sourceTree = "<group>"; };
-               A273E0480C57B39A00493A45 /* Brushed Window.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "Brushed Window.tiff"; sourceTree = "<group>"; };
-               A273E0490C57B39A00493A45 /* Drawer-List2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Drawer-List2.png"; sourceTree = "<group>"; };
+               A20F46DB0EBB5E7A005B861B /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
+               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>"; };
                A273E04C0C57B39A00493A45 /* Stop.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Stop.tiff; sourceTree = "<group>"; };
-               A273E04D0C57B39A00493A45 /* Terminal.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Terminal.tiff; sourceTree = "<group>"; };
-               A273E0950C57C19500493A45 /* muxmkv.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = muxmkv.c; path = ../libhb/muxmkv.c; sourceTree = SOURCE_ROOT; };
-               A28468670C5A43D900EF9A98 /* Disc.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Disc.tiff; sourceTree = "<group>"; };
+               A27BB4E90EFAB9310027CDF9 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PicturePreview.xib; sourceTree = "<group>"; };
                A29E057F0BE1283E000533F5 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Growl.framework; sourceTree = "<group>"; };
                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>"; };
-               A2DFC66C0C6196D900E66E89 /* actionWidget.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = actionWidget.png; sourceTree = "<group>"; };
-               A2DFC66D0C6196D900E66E89 /* actionWidgetPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = actionWidgetPressed.png; sourceTree = "<group>"; };
-               A2DFC6740C6197C600E66E89 /* MVMenuButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MVMenuButton.h; sourceTree = "<group>"; };
-               A2DFC6760C61980700E66E89 /* MVMenuButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MVMenuButton.m; sourceTree = "<group>"; };
-               A97A1DB30C91A6800015BC08 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Express.nib; sourceTree = "<group>"; };
+               A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureController.h; 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>"; };
+               A2D7AD620C998AD30082CA33 /* pref-audio.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "pref-audio.tiff"; sourceTree = "<group>"; };
+               A2D7AD640C998AD30082CA33 /* pref-picture.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "pref-picture.tiff"; sourceTree = "<group>"; };
+               A2D7AD650C998AD30082CA33 /* Queue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Queue.tiff; sourceTree = "<group>"; };
+               A2D7AD660C998AD30082CA33 /* Source.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Source.tiff; sourceTree = "<group>"; };
+               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>"; };
-               A9AC41E60C918DC000DDF9B8 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/AdvancedView.nib; sourceTree = "<group>"; };
-               B48359A70C82960500E04440 /* lang.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = lang.c; path = ../libhb/lang.c; sourceTree = SOURCE_ROOT; };
+               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>"; };
-               E30EC76F0C90BDD0004B9545 /* Encodes.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Encodes.png; sourceTree = "<group>"; };
-               E30EC7700C90BDD0004B9545 /* PassesPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PassesPressed.png; sourceTree = "<group>"; };
-               E30EC7710C90BDD0004B9545 /* Passes.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Passes.png; sourceTree = "<group>"; };
-               E30EC7720C90BDD0004B9545 /* EncodesPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodesPressed.png; sourceTree = "<group>"; };
-               E318F0460C90D6D3003EFB59 /* JobPassLarge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassLarge.png; sourceTree = "<group>"; };
-               E318F0570C90D88C003EFB59 /* JobPassSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassSmall.png; sourceTree = "<group>"; };
-               E318F0820C90DC4A003EFB59 /* Info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Info.png; sourceTree = "<group>"; };
+               E37167830C92F6180072B384 /* JobPassSecondSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassSecondSmall.png; sourceTree = "<group>"; };
+               E37167840C92F6180072B384 /* JobPassSubtitleSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassSubtitleSmall.png; sourceTree = "<group>"; };
+               E37167850C92F6180072B384 /* JobPassFirstSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassFirstSmall.png; sourceTree = "<group>"; };
+               E37167A70C92FAA50072B384 /* JobPassUnknownSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobPassUnknownSmall.png; sourceTree = "<group>"; };
+               E37172650C977D340072B384 /* HBImageAndTextCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBImageAndTextCell.m; sourceTree = "<group>"; };
+               E37172660C977D340072B384 /* HBImageAndTextCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBImageAndTextCell.h; sourceTree = "<group>"; };
                E37C893D0C83988F00C1B919 /* DeleteHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeleteHighlight.png; sourceTree = "<group>"; };
                E37C893E0C83988F00C1B919 /* Delete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Delete.png; sourceTree = "<group>"; };
                E37C893F0C83988F00C1B919 /* JobSmall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobSmall.png; sourceTree = "<group>"; };
                E37C89400C83988F00C1B919 /* JobLarge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JobLarge.png; sourceTree = "<group>"; };
                E37C89450C83989F00C1B919 /* HBQueueController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = HBQueueController.mm; sourceTree = "<group>"; };
                E37C89460C83989F00C1B919 /* HBQueueController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBQueueController.h; sourceTree = "<group>"; };
-               E37C894E0C8398CF00C1B919 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Queue.nib; sourceTree = "<group>"; };
-               EAA526920C3B25D200944FF2 /* stream.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = stream.c; path = ../libhb/stream.c; sourceTree = SOURCE_ROOT; };
-               FC85194C0C59A02C0073812C /* denoise.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = denoise.c; path = ../libhb/denoise.c; sourceTree = SOURCE_ROOT; };
-               FC85194D0C59A02C0073812C /* deinterlace.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = deinterlace.c; path = ../libhb/deinterlace.c; sourceTree = SOURCE_ROOT; };
-               FC85194E0C59A02C0073812C /* deblock.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = deblock.c; path = ../libhb/deblock.c; sourceTree = SOURCE_ROOT; };
-               FC85194F0C59A02C0073812C /* detelecine.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = detelecine.c; path = ../libhb/detelecine.c; sourceTree = SOURCE_ROOT; };
+               E3997A260CAB58BC00287239 /* EncodeWorking3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking3.png; sourceTree = "<group>"; };
+               E3997A270CAB58BC00287239 /* EncodeWorking4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking4.png; sourceTree = "<group>"; };
+               E3997A280CAB58BC00287239 /* EncodeWorking1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking1.png; sourceTree = "<group>"; };
+               E3997A290CAB58BC00287239 /* EncodeWorking0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking0.png; sourceTree = "<group>"; };
+               E3997A2A0CAB58BC00287239 /* EncodeWorking2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking2.png; sourceTree = "<group>"; };
+               E3997A2B0CAB58BC00287239 /* EncodeWorking5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeWorking5.png; sourceTree = "<group>"; };
+               E39AA4DB0D32DC0B0007A415 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
+               E39AA4DD0D32DC0B0007A415 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Queue.xib; sourceTree = "<group>"; };
+               E39AA4DF0D32DC0B0007A415 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preferences.xib; sourceTree = "<group>"; };
+               E39AA4E10D32DC0B0007A415 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PictureSettings.xib; sourceTree = "<group>"; };
+               E39AA4E30D32DC0B0007A415 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/AdvancedView.xib; sourceTree = "<group>"; };
+               E39AA4E50D32DC0B0007A415 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/OutputPanel.xib; sourceTree = "<group>"; };
+               E3C844F20CA6B3F90013B683 /* RevealPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RevealPressed.png; sourceTree = "<group>"; };
+               E3C844F30CA6B3F90013B683 /* RevealHighlightPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RevealHighlightPressed.png; sourceTree = "<group>"; };
+               E3C844F40CA6B3F90013B683 /* RevealHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = RevealHighlight.png; sourceTree = "<group>"; };
+               E3C844F50CA6B3F90013B683 /* Reveal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Reveal.png; sourceTree = "<group>"; };
+               E3C845860CA6E9080013B683 /* EncodeComplete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeComplete.png; sourceTree = "<group>"; };
+               E3FC10900D1611EC00470E7B /* EncodeCanceled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = EncodeCanceled.png; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-               0D096DFD0B707D1200A845D4 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               0D096EA30B70884A00A845D4 /* libz.dylib in Frameworks */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               0DFF0B700B6BC6E600549488 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                0DFF0C080B6BCEC200549488 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               4D1EA2D80993B01000FDC1A2 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               4D1EA2F60993B0CA00FDC1A2 /* Cocoa.framework in Frameworks */,
-                               4D2AEA1A09CCB332007E18F6 /* IOKit.framework in Frameworks */,
-                               4D1125D909D72FD200E0657B /* libz.dylib in Frameworks */,
+                               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 */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        buildActionMask = 2147483647;
                        files = (
                                4DD93FA2082036E8008E1322 /* Cocoa.framework in Frameworks */,
-                               4DD93FA3082036E8008E1322 /* IOKit.framework in Frameworks */,
+                               A25962E10F15077500B3BF4E /* Quartz.framework in Frameworks */,
+                               A20F47010EBB5EC2005B861B /* QTKit.framework in Frameworks */,
                                4DD93FA4082036E8008E1322 /* OpenGL.framework in Frameworks */,
-                               4D1125D809D72FD200E0657B /* libz.dylib 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 */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                19C28FACFE9D520D11CA2CBB /* Products */ = {
                        isa = PBXGroup;
                        children = (
-                               4D1EA2DA0993B01000FDC1A2 /* Instant HandBrake.app */,
-                               0DFF0B720B6BC6E600549488 /* libhb.a */,
                                0DFF0C0A0B6BCEC200549488 /* HandBrakeCLI */,
                                0D6E35760B6BD4F0005AABB3 /* HandBrake.app */,
-                               0D096DFF0B707D1200A845D4 /* libhb.dylib */,
                        );
                        name = Products;
                        sourceTree = "<group>";
                29B97314FDCFA39411CA2CEA /* HandBrake */ = {
                        isa = PBXGroup;
                        children = (
-                               A273E0460C57B39A00493A45 /* icons */,
-                               526FBC940B4CAA310064E04C /* Instant HandBrake Sources */,
                                526FBC930B4CAA260064E04C /* HandBrake Sources */,
                                526FBC920B4CAA120064E04C /* HandBrakeCLI Sources */,
-                               526FBC8D0B4CA9F90064E04C /* libhb Sources */,
-                               29B97315FDCFA39411CA2CEA /* Other Sources */,
                                29B97317FDCFA39411CA2CEA /* Resources */,
                                089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
                                29B97323FDCFA39411CA2CEA /* Frameworks */,
                                19C28FACFE9D520D11CA2CBB /* Products */,
+                               274DD1E30FEF109900881E69 /* libiconv.dylib */,
                        );
                        name = HandBrake;
                        sourceTree = "<group>";
                };
-               29B97315FDCFA39411CA2CEA /* Other Sources */ = {
-                       isa = PBXGroup;
-                       children = (
-                               29B97316FDCFA39411CA2CEA /* main.mm */,
-                       );
-                       name = "Other Sources";
-                       sourceTree = "<group>";
-               };
                29B97317FDCFA39411CA2CEA /* Resources */ = {
                        isa = PBXGroup;
                        children = (
+                               A256080B0FD06720006A4277 /* Brushed_Window.png */,
+                               A27BB4E80EFAB9310027CDF9 /* PicturePreview.xib */,
+                               A273E0460C57B39A00493A45 /* icons */,
                                0DFA5C7A0B8DD1E90020BC09 /* HandBrake.icns */,
-                               29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
-                               A97A1DB20C91A6800015BC08 /* Express.nib */,
-                               A9AC41E50C918DC000DDF9B8 /* AdvancedView.nib */,
-                               2538860A0BFE0B730064E995 /* OutputPanel.nib */,
-                               25DE1FAB0C1699E500F01FC8 /* Preferences.nib */,
-                               4D1EA3000993B13700FDC1A2 /* Express.nib */,
-                               E37C894D0C8398CF00C1B919 /* Queue.nib */,
+                               2728D25A0FE8419900758EC9 /* HandBrake-64.icns */,
+                               E39AA4DA0D32DC0B0007A415 /* MainMenu.xib */,
+                               E39AA4E20D32DC0B0007A415 /* AdvancedView.xib */,
+                               E39AA4E40D32DC0B0007A415 /* OutputPanel.xib */,
+                               E39AA4E00D32DC0B0007A415 /* PictureSettings.xib */,
+                               E39AA4DE0D32DC0B0007A415 /* Preferences.xib */,
+                               E39AA4DC0D32DC0B0007A415 /* Queue.xib */,
                        );
                        name = Resources;
                        sourceTree = "<group>";
                29B97323FDCFA39411CA2CEA /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (
+                               A906A0500F7A7B210007A827 /* AudioToolbox.framework */,
+                               A25962E00F15077500B3BF4E /* Quartz.framework */,
+                               A20F47000EBB5EC2005B861B /* QTKit.framework */,
+                               A20F46DB0EBB5E7A005B861B /* QuickTime.framework */,
+                               D289A9F20DBBE7AC00CE614B /* CoreServices.framework */,
+                               A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */,
                                A29E057F0BE1283E000533F5 /* Growl.framework */,
-                               4D1125D709D72FD200E0657B /* libz.dylib */,
                                1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
                                4DEB2024052B055F00C39CA9 /* IOKit.framework */,
                                4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */,
                                29B97325FDCFA39411CA2CEA /* Foundation.framework */,
                                29B97324FDCFA39411CA2CEA /* AppKit.framework */,
+                               2713E50C0F675F32002E0A01 /* libhb.a */,
+                               2774BE8F0F66F47100B65FC6 /* libbz2.dylib */,
+                               2774BE910F66F48200B65FC6 /* libz.dylib */,
                        );
                        name = Frameworks;
                        sourceTree = "<group>";
                };
-               526FBC8D0B4CA9F90064E04C /* libhb Sources */ = {
-                       isa = PBXGroup;
-                       children = (
-                               B48359A70C82960500E04440 /* lang.c */,
-                               A273E0950C57C19500493A45 /* muxmkv.c */,
-                               EAA526920C3B25D200944FF2 /* stream.c */,
-                               0DFA5C7E0B8DD3B60020BC09 /* declpcm.c */,
-                               0DFA5C7F0B8DD3B60020BC09 /* decmpeg2.c */,
-                               0DFA5C800B8DD3B60020BC09 /* decsub.c */,
-                               0DFA5C810B8DD3B60020BC09 /* demuxmpeg.c */,
-                               0DFA5C820B8DD3B60020BC09 /* dvd.c */,
-                               0DFA5C830B8DD3B60020BC09 /* encavcodec.c */,
-                               0DFA5C840B8DD3B60020BC09 /* encfaac.c */,
-                               0DFA5C850B8DD3B60020BC09 /* enclame.c */,
-                               0DFA5C860B8DD3B60020BC09 /* encvorbis.c */,
-                               FC85194C0C59A02C0073812C /* denoise.c */,
-                               FC85194D0C59A02C0073812C /* deinterlace.c */,
-                               FC85194E0C59A02C0073812C /* deblock.c */,
-                               FC85194F0C59A02C0073812C /* detelecine.c */,
-                               0DFA5C870B8DD3B60020BC09 /* encx264.c */,
-                               0DFA5C880B8DD3B60020BC09 /* encxvid.c */,
-                               0DFA5C890B8DD3B60020BC09 /* fifo.c */,
-                               0DFA5C8A0B8DD3B60020BC09 /* hb.c */,
-                               0DFA5C8D0B8DD3B60020BC09 /* ipodutil.cpp */,
-                               0DFA5C910B8DD3B60020BC09 /* muxavi.c */,
-                               0DFA5C920B8DD3B60020BC09 /* muxcommon.c */,
-                               0DFA5C930B8DD3B60020BC09 /* muxmp4.c */,
-                               0DFA5C940B8DD3B60020BC09 /* muxogm.c */,
-                               0DFA5C950B8DD3B60020BC09 /* ports.c */,
-                               0DFA5C970B8DD3B60020BC09 /* reader.c */,
-                               0DFA5C980B8DD3B60020BC09 /* render.c */,
-                               0DFA5C990B8DD3B60020BC09 /* scan.c */,
-                               0DFA5C9A0B8DD3B60020BC09 /* sync.c */,
-                               0DFA5C9B0B8DD3B60020BC09 /* update.c */,
-                               0DFA5C9C0B8DD3B60020BC09 /* work.c */,
-                               526FBC9B0B4CAB100064E04C /* common.c */,
-                               526FBC9D0B4CAB100064E04C /* deca52.c */,
-                               5558B5680BE3BADF00E15E27 /* decdca.c */,
-                               526FBC9E0B4CAB100064E04C /* decavcodec.c */,
-                       );
-                       name = "libhb Sources";
-                       sourceTree = "<group>";
-               };
                526FBC920B4CAA120064E04C /* HandBrakeCLI Sources */ = {
                        isa = PBXGroup;
                        children = (
-                               0DF377970B7BF99A00115CB0 /* fakexcode.cpp */,
+                               27AC71840F5A0AF600053B83 /* fakexcode.cpp */,
                                526FBC760B4CA8F40064E04C /* test.c */,
                                59CBD2360BBB44DA004A3BE3 /* parsecsv.c */,
                        );
                526FBC930B4CAA260064E04C /* HandBrake Sources */ = {
                        isa = PBXGroup;
                        children = (
-                               A2DFC6760C61980700E66E89 /* MVMenuButton.m */,
-                               A2DFC6740C6197C600E66E89 /* MVMenuButton.h */,
-                               0DFA5D060B8DD9040020BC09 /* HandBrake.plist */,
-                               4D1FD381073D19CE00E46515 /* PictureController.h */,
-                               4D1FD382073D19CE00E46515 /* PictureController.mm */,
+                               D234BCB91240E82800BE2E98 /* HBAudio.h */,
+                               D234BCBA1240E82800BE2E98 /* HBAudio.m */,
+                               D234BCBB1240E82800BE2E98 /* HBAudioController.h */,
+                               D234BCBC1240E82800BE2E98 /* HBAudioController.m */,
+                               A2D18AA50FD81C50003C997B /* HBSubtitles.h */,
+                               A2D18AA60FD81C50003C997B /* HBSubtitles.m */,
                                4DF3C8CB052889CD00A80101 /* Controller.h */,
-                               4DF3C8CC052889CD00A80101 /* Controller.mm */,
-                               4D85758E052B78E300C39CA9 /* PictureGLView.mm */,
-                               4D85758F052B78E300C39CA9 /* PictureGLView.h */,
-                               4D3ECC2509A4917000B2E45F /* WhiteBox.h */,
-                               4D3ECC2609A4917000B2E45F /* WhiteBox.m */,
+                               4DF3C8CC052889CD00A80101 /* Controller.m */,
+                               A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */,
+                               A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */,
+                               A22C85EA0D05D35000C10E36 /* HBPresets.h */,
+                               A22C85EB0D05D35000C10E36 /* HBPresets.m */,
+                               4D1FD381073D19CE00E46515 /* HBPreviewController.h */,
+                               4D1FD382073D19CE00E46515 /* HBPreviewController.m */,
                                593034E90BBA39A100172349 /* ChapterTitles.h */,
                                593034EA0BBA39A100172349 /* ChapterTitles.m */,
                                A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */,
                                25DE1FB50C169A0C00F01FC8 /* HBPreferencesController.m */,
                                E37C89460C83989F00C1B919 /* HBQueueController.h */,
                                E37C89450C83989F00C1B919 /* HBQueueController.mm */,
-                               A9AC41DD0C918DB500DDF9B8 /* HBAdvancedController.m */,
                                A9AC41DE0C918DB500DDF9B8 /* HBAdvancedController.h */,
+                               A9AC41DD0C918DB500DDF9B8 /* HBAdvancedController.m */,
+                               E37172660C977D340072B384 /* HBImageAndTextCell.h */,
+                               E37172650C977D340072B384 /* HBImageAndTextCell.m */,
+                               29B97316FDCFA39411CA2CEA /* main.mm */,
                        );
                        name = "HandBrake Sources";
                        sourceTree = "<group>";
                };
-               526FBC940B4CAA310064E04C /* Instant HandBrake Sources */ = {
-                       isa = PBXGroup;
-                       children = (
-                               A2122D800C7EAF6500AB87A4 /* DriveDetector.h */,
-                               A2122D810C7EAF6600AB87A4 /* DriveDetector.m */,
-                               4D1EA31A0993B24700FDC1A2 /* ExpressController.h */,
-                               4D1EA31B0993B24700FDC1A2 /* ExpressController.m */,
-                               4D1EA2DC0993B01000FDC1A2 /* Express.plist */,
-                       );
-                       name = "Instant HandBrake Sources";
-                       sourceTree = "<group>";
-               };
                A273E0460C57B39A00493A45 /* icons */ = {
                        isa = PBXGroup;
                        children = (
-                               A2DFC66C0C6196D900E66E89 /* actionWidget.png */,
-                               A2DFC66D0C6196D900E66E89 /* actionWidgetPressed.png */,
-                               A28468670C5A43D900EF9A98 /* Disc.tiff */,
-                               A273E0470C57B39A00493A45 /* Add.tiff */,
-                               A273E0480C57B39A00493A45 /* Brushed Window.tiff */,
-                               A273E0490C57B39A00493A45 /* Drawer-List2.png */,
+                               A2D7AD660C998AD30082CA33 /* Source.tiff */,
                                A273E04A0C57B39A00493A45 /* Pause.tiff */,
                                A273E04B0C57B39A00493A45 /* Play.tiff */,
                                A273E04C0C57B39A00493A45 /* Stop.tiff */,
-                               A273E04D0C57B39A00493A45 /* Terminal.tiff */,
+                               A2D7AD5F0C998AD30082CA33 /* AddToQueue.tiff */,
+                               A2D7AD650C998AD30082CA33 /* Queue.tiff */,
+                               A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */,
+                               A2D7AD600C998AD30082CA33 /* Drawer.tiff */,
+                               A2D7AD620C998AD30082CA33 /* pref-audio.tiff */,
+                               A2D7AD640C998AD30082CA33 /* pref-picture.tiff */,
                                E37C893E0C83988F00C1B919 /* Delete.png */,
                                E3003CB40C8852B70072F2A8 /* DeletePressed.png */,
                                E37C893D0C83988F00C1B919 /* DeleteHighlight.png */,
                                E3003C7E0C88505D0072F2A8 /* DeleteHighlightPressed.png */,
                                E37C89400C83988F00C1B919 /* JobLarge.png */,
                                E37C893F0C83988F00C1B919 /* JobSmall.png */,
-                               E30EC76F0C90BDD0004B9545 /* Encodes.png */,
-                               E30EC7720C90BDD0004B9545 /* EncodesPressed.png */,
-                               E30EC7700C90BDD0004B9545 /* PassesPressed.png */,
-                               E30EC7710C90BDD0004B9545 /* Passes.png */,
-                               E318F0570C90D88C003EFB59 /* JobPassSmall.png */,
-                               E318F0460C90D6D3003EFB59 /* JobPassLarge.png */,
-                               E318F0820C90DC4A003EFB59 /* Info.png */,
+                               E37167850C92F6180072B384 /* JobPassFirstSmall.png */,
+                               E37167830C92F6180072B384 /* JobPassSecondSmall.png */,
+                               E37167840C92F6180072B384 /* JobPassSubtitleSmall.png */,
+                               E37167A70C92FAA50072B384 /* JobPassUnknownSmall.png */,
+                               E3C844F50CA6B3F90013B683 /* Reveal.png */,
+                               E3C844F20CA6B3F90013B683 /* RevealPressed.png */,
+                               E3C844F40CA6B3F90013B683 /* RevealHighlight.png */,
+                               E3C844F30CA6B3F90013B683 /* RevealHighlightPressed.png */,
+                               E3FC10900D1611EC00470E7B /* EncodeCanceled.png */,
+                               E3C845860CA6E9080013B683 /* EncodeComplete.png */,
+                               E3997A290CAB58BC00287239 /* EncodeWorking0.png */,
+                               E3997A280CAB58BC00287239 /* EncodeWorking1.png */,
+                               E3997A2A0CAB58BC00287239 /* EncodeWorking2.png */,
+                               E3997A260CAB58BC00287239 /* EncodeWorking3.png */,
+                               E3997A270CAB58BC00287239 /* EncodeWorking4.png */,
+                               E3997A2B0CAB58BC00287239 /* EncodeWorking5.png */,
                        );
                        path = icons;
                        sourceTree = "<group>";
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-               0D096DFB0B707D1200A845D4 /* Headers */ = {
-                       isa = PBXHeadersBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               0DFF0B6E0B6BC6E600549488 /* Headers */ = {
-                       isa = PBXHeadersBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               593034EB0BBA39A100172349 /* ChapterTitles.h in Headers */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                4DD93F8E082036E8008E1322 /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               A2DFC6750C6197C600E66E89 /* MVMenuButton.h in Headers */,
                                4DD93F8F082036E8008E1322 /* Controller.h in Headers */,
-                               4DD93F90082036E8008E1322 /* PictureGLView.h in Headers */,
-                               4DD93F92082036E8008E1322 /* PictureController.h in Headers */,
+                               4DD93F92082036E8008E1322 /* HBPreviewController.h in Headers */,
                                A2A1EC310C76C35E00827E0D /* HBDVDDetector.h in Headers */,
                                253886010BFE0A5B0064E995 /* HBOutputRedirect.h in Headers */,
                                253886170BFE0C160064E995 /* HBOutputPanelController.h in Headers */,
                                25DE1FB60C169A0C00F01FC8 /* HBPreferencesController.h in Headers */,
                                E37C89480C83989F00C1B919 /* HBQueueController.h in Headers */,
                                A9AC41E00C918DB500DDF9B8 /* HBAdvancedController.h in Headers */,
+                               E37172680C977D340072B384 /* HBImageAndTextCell.h in Headers */,
+                               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;
                };
 /* End PBXHeadersBuildPhase section */
 
-/* Begin PBXNativeTarget section */
-               0D096DFE0B707D1200A845D4 /* libhb dlib */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 0D096E650B707D5800A845D4 /* Build configuration list for PBXNativeTarget "libhb dlib" */;
+/* Begin PBXLegacyTarget section */
+               27F143770F5DF34F00A684FF /* external */ = {
+                       isa = PBXLegacyTarget;
+                       buildArgumentsString = "\"$EXTERNAL_SRC/make/xcodemake";
+                       buildConfigurationList = 27F1438E0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "external" */;
                        buildPhases = (
-                               0D096DFB0B707D1200A845D4 /* Headers */,
-                               0D096DFC0B707D1200A845D4 /* Sources */,
-                               0D096DFD0B707D1200A845D4 /* Frameworks */,
-                       );
-                       buildRules = (
                        );
+                       buildToolPath = /bin/sh;
                        dependencies = (
                        );
-                       name = "libhb dlib";
-                       productName = "libmediafork dlib";
-                       productReference = 0D096DFF0B707D1200A845D4 /* libhb.dylib */;
-                       productType = "com.apple.product-type.library.dynamic";
-               };
-               0DFF0B710B6BC6E600549488 /* libhb */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libhb" */;
+                       name = external;
+                       passBuildSettingsInEnvironment = 1;
+                       productName = external;
+               };
+               27F1437E0F5DF36000A684FF /* contrib */ = {
+                       isa = PBXLegacyTarget;
+                       buildArgumentsString = "\"$EXTERNAL_SRC/make/xcodemake";
+                       buildConfigurationList = 27F1438F0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "contrib" */;
                        buildPhases = (
-                               0DFF0B6E0B6BC6E600549488 /* Headers */,
-                               0DFF0B6F0B6BC6E600549488 /* Sources */,
-                               0DFF0B700B6BC6E600549488 /* Frameworks */,
                        );
-                       buildRules = (
+                       buildToolPath = /bin/sh;
+                       dependencies = (
+                       );
+                       name = contrib;
+                       passBuildSettingsInEnvironment = 1;
+                       productName = contrib;
+               };
+               27F143850F5DF37600A684FF /* libhb */ = {
+                       isa = PBXLegacyTarget;
+                       buildArgumentsString = "\"$EXTERNAL_SRC/make/xcodemake";
+                       buildConfigurationList = 27F143900F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "libhb" */;
+                       buildPhases = (
                        );
+                       buildToolPath = /bin/sh;
                        dependencies = (
                        );
                        name = libhb;
-                       productName = libmediafork;
-                       productReference = 0DFF0B720B6BC6E600549488 /* libhb.a */;
-                       productType = "com.apple.product-type.library.static";
+                       passBuildSettingsInEnvironment = 1;
+                       productName = libhb;
                };
+/* End PBXLegacyTarget section */
+
+/* Begin PBXNativeTarget section */
                0DFF0C090B6BCEC200549488 /* HandBrakeCLI */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 0DFF0C0C0B6BCEE000549488 /* Build configuration list for PBXNativeTarget "HandBrakeCLI" */;
                        buildRules = (
                        );
                        dependencies = (
-                               0D6E35910B6BD5FA005AABB3 /* PBXTargetDependency */,
+                               277C2E560F5DFF450067D708 /* PBXTargetDependency */,
                        );
                        name = HandBrakeCLI;
                        productName = HandBrakeCLI;
                        productReference = 0DFF0C0A0B6BCEC200549488 /* HandBrakeCLI */;
                        productType = "com.apple.product-type.tool";
                };
-               4D1EA2D90993B01000FDC1A2 /* Instant HandBrake */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "Instant HandBrake" */;
-                       buildPhases = (
-                               4D1EA2D60993B01000FDC1A2 /* Resources */,
-                               4D1EA2D70993B01000FDC1A2 /* Sources */,
-                               4D1EA2D80993B01000FDC1A2 /* Frameworks */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                               0DFF0BF20B6BCCB400549488 /* PBXTargetDependency */,
-                       );
-                       name = "Instant HandBrake";
-                       productName = "Instant HandBrake";
-                       productReference = 4D1EA2DA0993B01000FDC1A2 /* Instant HandBrake.app */;
-                       productType = "com.apple.product-type.application";
-               };
                4DD93F8D082036E8008E1322 /* HandBrake */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 4D4E7BC0087804870051572B /* Build configuration list for PBXNativeTarget "HandBrake" */;
                        buildRules = (
                        );
                        dependencies = (
-                               0DFF0BF40B6BCCB900549488 /* PBXTargetDependency */,
+                               277C2E540F5DFF400067D708 /* PBXTargetDependency */,
                        );
                        name = HandBrake;
                        productName = HandBrake;
 /* Begin PBXProject section */
                29B97313FDCFA39411CA2CEA /* Project object */ = {
                        isa = PBXProject;
+                       attributes = {
+                               BuildIndependentTargetsInParallel = YES;
+                       };
                        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 = "";
                        targets = (
                                4DD93F8D082036E8008E1322 /* HandBrake */,
-                               4D1EA2D90993B01000FDC1A2 /* Instant HandBrake */,
-                               0DFF0B710B6BC6E600549488 /* libhb */,
                                0DFF0C090B6BCEC200549488 /* HandBrakeCLI */,
-                               0D096DFE0B707D1200A845D4 /* libhb dlib */,
+                               27F143770F5DF34F00A684FF /* external */,
+                               27F143850F5DF37600A684FF /* libhb */,
+                               27F1437E0F5DF36000A684FF /* contrib */,
                        );
                };
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
-               4D1EA2D60993B01000FDC1A2 /* Resources */ = {
-                       isa = PBXResourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               0DFA5CF80B8DD7B40020BC09 /* HandBrake.icns in Resources */,
-                               52AFF86B0B59BD14000DA7C4 /* Express.plist in Resources */,
-                               52AFF86A0B59BD07000DA7C4 /* InfoPlist.strings in Resources */,
-                               4D1EA3010993B13700FDC1A2 /* Express.nib in Resources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                4DD93F95082036E8008E1322 /* Resources */ = {
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               0DFA5D070B8DD9040020BC09 /* HandBrake.plist in Resources */,
-                               4DD93F96082036E8008E1322 /* MainMenu.nib in Resources */,
                                4DD93F97082036E8008E1322 /* InfoPlist.strings in Resources */,
                                0DFA5C7B0B8DD1E90020BC09 /* HandBrake.icns in Resources */,
-                               2538860C0BFE0B730064E995 /* OutputPanel.nib in Resources */,
-                               25DE1FAD0C1699E500F01FC8 /* Preferences.nib in Resources */,
-                               A273E04E0C57B39A00493A45 /* Add.tiff in Resources */,
-                               A273E04F0C57B39A00493A45 /* Brushed Window.tiff in Resources */,
-                               A273E0500C57B39A00493A45 /* Drawer-List2.png in Resources */,
                                A273E0510C57B39A00493A45 /* Pause.tiff in Resources */,
                                A273E0520C57B39A00493A45 /* Play.tiff in Resources */,
                                A273E0530C57B39A00493A45 /* Stop.tiff in Resources */,
-                               A273E0540C57B39A00493A45 /* Terminal.tiff in Resources */,
-                               A28468680C5A43D900EF9A98 /* Disc.tiff in Resources */,
-                               A2DFC66E0C6196D900E66E89 /* actionWidget.png in Resources */,
-                               A2DFC66F0C6196D900E66E89 /* actionWidgetPressed.png in Resources */,
                                E37C89410C83988F00C1B919 /* DeleteHighlight.png in Resources */,
                                E37C89420C83988F00C1B919 /* Delete.png in Resources */,
                                E37C89430C83988F00C1B919 /* JobSmall.png in Resources */,
                                E37C89440C83988F00C1B919 /* JobLarge.png in Resources */,
-                               E37C894F0C8398CF00C1B919 /* Queue.nib in Resources */,
                                E3003C7F0C88505D0072F2A8 /* DeleteHighlightPressed.png in Resources */,
                                E3003CB50C8852B70072F2A8 /* DeletePressed.png in Resources */,
-                               E30EC7730C90BDD0004B9545 /* Encodes.png in Resources */,
-                               E30EC7740C90BDD0004B9545 /* PassesPressed.png in Resources */,
-                               E30EC7750C90BDD0004B9545 /* Passes.png in Resources */,
-                               E30EC7760C90BDD0004B9545 /* EncodesPressed.png in Resources */,
-                               E318F0470C90D6D3003EFB59 /* JobPassLarge.png in Resources */,
-                               E318F0580C90D88C003EFB59 /* JobPassSmall.png in Resources */,
-                               E318F0830C90DC4A003EFB59 /* Info.png in Resources */,
-                               A9AC41E70C918DC000DDF9B8 /* AdvancedView.nib in Resources */,
-                               A97A1DB40C91A6800015BC08 /* Express.nib in Resources */,
+                               E37167890C92F6180072B384 /* JobPassSecondSmall.png in Resources */,
+                               E371678A0C92F6180072B384 /* JobPassSubtitleSmall.png in Resources */,
+                               E371678B0C92F6180072B384 /* JobPassFirstSmall.png in Resources */,
+                               E37167A90C92FAA50072B384 /* JobPassUnknownSmall.png in Resources */,
+                               A2D7AD670C998AD30082CA33 /* ActivityWindow.tiff in Resources */,
+                               A2D7AD680C998AD30082CA33 /* AddToQueue.tiff in Resources */,
+                               A2D7AD690C998AD30082CA33 /* Drawer.tiff in Resources */,
+                               A2D7AD6B0C998AD30082CA33 /* pref-audio.tiff in Resources */,
+                               A2D7AD6D0C998AD30082CA33 /* pref-picture.tiff in Resources */,
+                               A2D7AD6E0C998AD30082CA33 /* Queue.tiff in Resources */,
+                               A2D7AD6F0C998AD30082CA33 /* Source.tiff in Resources */,
+                               E3C844F60CA6B3F90013B683 /* RevealPressed.png in Resources */,
+                               E3C844F70CA6B3F90013B683 /* RevealHighlightPressed.png in Resources */,
+                               E3C844F80CA6B3F90013B683 /* RevealHighlight.png in Resources */,
+                               E3C844F90CA6B3F90013B683 /* Reveal.png in Resources */,
+                               E3C845870CA6E9080013B683 /* EncodeComplete.png in Resources */,
+                               E3997A2C0CAB58BC00287239 /* EncodeWorking3.png in Resources */,
+                               E3997A2D0CAB58BC00287239 /* EncodeWorking4.png in Resources */,
+                               E3997A2E0CAB58BC00287239 /* EncodeWorking1.png in Resources */,
+                               E3997A2F0CAB58BC00287239 /* EncodeWorking0.png in Resources */,
+                               E3997A300CAB58BC00287239 /* EncodeWorking2.png in Resources */,
+                               E3997A310CAB58BC00287239 /* EncodeWorking5.png in Resources */,
+                               E3FC10910D1611EC00470E7B /* EncodeCanceled.png in Resources */,
+                               E39AA4E60D32DC0B0007A415 /* MainMenu.xib in Resources */,
+                               E39AA4E70D32DC0B0007A415 /* Queue.xib in Resources */,
+                               E39AA4E80D32DC0B0007A415 /* Preferences.xib in Resources */,
+                               E39AA4E90D32DC0B0007A415 /* PictureSettings.xib in Resources */,
+                               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;
                };
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-               0D096DFC0B707D1200A845D4 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               D4D49FED0C83355600F01215 /* lang.c in Sources */,
-                               0DFA5CD90B8DD4210020BC09 /* declpcm.c in Sources */,
-                               0DFA5CDA0B8DD4210020BC09 /* decmpeg2.c in Sources */,
-                               0DFA5CDB0B8DD4210020BC09 /* decsub.c in Sources */,
-                               0DFA5CDC0B8DD4210020BC09 /* demuxmpeg.c in Sources */,
-                               0DFA5CDD0B8DD4210020BC09 /* dvd.c in Sources */,
-                               0DFA5CDE0B8DD4210020BC09 /* encavcodec.c in Sources */,
-                               0DFA5CDF0B8DD4210020BC09 /* encfaac.c in Sources */,
-                               0DFA5CE00B8DD4210020BC09 /* enclame.c in Sources */,
-                               0DFA5CE10B8DD4210020BC09 /* encvorbis.c in Sources */,
-                               0DFA5CE20B8DD4210020BC09 /* encx264.c in Sources */,
-                               0DFA5CE30B8DD4210020BC09 /* encxvid.c in Sources */,
-                               0DFA5CE40B8DD4210020BC09 /* fifo.c in Sources */,
-                               0DFA5CE50B8DD4210020BC09 /* hb.c in Sources */,
-                               0DFA5CE60B8DD4210020BC09 /* ipodutil.cpp in Sources */,
-                               0DFA5CE70B8DD4210020BC09 /* muxavi.c in Sources */,
-                               0DFA5CE80B8DD4210020BC09 /* muxcommon.c in Sources */,
-                               0DFA5CE90B8DD4210020BC09 /* muxmp4.c in Sources */,
-                               0DFA5CEA0B8DD4210020BC09 /* muxogm.c in Sources */,
-                               0DFA5CEB0B8DD4210020BC09 /* ports.c in Sources */,
-                               0DFA5CEC0B8DD4210020BC09 /* reader.c in Sources */,
-                               0DFA5CED0B8DD4210020BC09 /* render.c in Sources */,
-                               0DFA5CEE0B8DD4210020BC09 /* scan.c in Sources */,
-                               0DFA5CEF0B8DD4210020BC09 /* sync.c in Sources */,
-                               0DFA5CF00B8DD4210020BC09 /* update.c in Sources */,
-                               0DFA5CF10B8DD4210020BC09 /* work.c in Sources */,
-                               0D096E010B707D3400A845D4 /* common.c in Sources */,
-                               0D096E020B707D3400A845D4 /* deca52.c in Sources */,
-                               0D096E030B707D3400A845D4 /* decavcodec.c in Sources */,
-                               5558B56A0BE3BADF00E15E27 /* decdca.c in Sources */,
-                               EAA526940C3B25D200944FF2 /* stream.c in Sources */,
-                               A273E09B0C57C1CD00493A45 /* muxmkv.c in Sources */,
-                               FC8519540C59A02C0073812C /* denoise.c in Sources */,
-                               FC8519550C59A02C0073812C /* deinterlace.c in Sources */,
-                               FC8519560C59A02C0073812C /* deblock.c in Sources */,
-                               FC8519570C59A02C0073812C /* detelecine.c in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               0DFF0B6F0B6BC6E600549488 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               0DFA5CC00B8DD3FE0020BC09 /* declpcm.c in Sources */,
-                               0DFA5CC10B8DD3FE0020BC09 /* decmpeg2.c in Sources */,
-                               0DFA5CC20B8DD3FE0020BC09 /* decsub.c in Sources */,
-                               0DFA5CC30B8DD3FE0020BC09 /* demuxmpeg.c in Sources */,
-                               0DFA5CC40B8DD3FE0020BC09 /* dvd.c in Sources */,
-                               0DFA5CC50B8DD3FE0020BC09 /* encavcodec.c in Sources */,
-                               0DFA5CC60B8DD3FE0020BC09 /* encfaac.c in Sources */,
-                               0DFA5CC70B8DD3FE0020BC09 /* enclame.c in Sources */,
-                               0DFA5CC80B8DD3FE0020BC09 /* encvorbis.c in Sources */,
-                               0DFA5CC90B8DD3FE0020BC09 /* encx264.c in Sources */,
-                               0DFA5CCA0B8DD3FE0020BC09 /* encxvid.c in Sources */,
-                               0DFA5CCB0B8DD3FE0020BC09 /* fifo.c in Sources */,
-                               0DFA5CCC0B8DD3FE0020BC09 /* hb.c in Sources */,
-                               0DFA5CCD0B8DD3FE0020BC09 /* ipodutil.cpp in Sources */,
-                               0DFA5CCE0B8DD3FE0020BC09 /* muxavi.c in Sources */,
-                               0DFA5CCF0B8DD3FE0020BC09 /* muxcommon.c in Sources */,
-                               0DFA5CD00B8DD3FE0020BC09 /* muxmp4.c in Sources */,
-                               0DFA5CD10B8DD3FE0020BC09 /* muxogm.c in Sources */,
-                               0DFA5CD20B8DD3FE0020BC09 /* ports.c in Sources */,
-                               0DFA5CD30B8DD3FE0020BC09 /* reader.c in Sources */,
-                               0DFA5CD40B8DD3FE0020BC09 /* render.c in Sources */,
-                               0DFA5CD50B8DD3FE0020BC09 /* scan.c in Sources */,
-                               0DFA5CD60B8DD3FE0020BC09 /* sync.c in Sources */,
-                               0DFA5CD70B8DD3FE0020BC09 /* update.c in Sources */,
-                               0DFA5CD80B8DD3FE0020BC09 /* work.c in Sources */,
-                               0DFF0B770B6BC72A00549488 /* common.c in Sources */,
-                               0DFF0B790B6BC72A00549488 /* deca52.c in Sources */,
-                               0DFF0B7A0B6BC72A00549488 /* decavcodec.c in Sources */,
-                               593034EC0BBA39A100172349 /* ChapterTitles.m in Sources */,
-                               5558B5690BE3BADF00E15E27 /* decdca.c in Sources */,
-                               EAA526930C3B25D200944FF2 /* stream.c in Sources */,
-                               A273E09A0C57C1CC00493A45 /* muxmkv.c in Sources */,
-                               FC8519500C59A02C0073812C /* denoise.c in Sources */,
-                               FC8519510C59A02C0073812C /* deinterlace.c in Sources */,
-                               FC8519520C59A02C0073812C /* deblock.c in Sources */,
-                               FC8519530C59A02C0073812C /* detelecine.c in Sources */,
-                               B48359A80C82960500E04440 /* lang.c in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                0DFF0C070B6BCEC200549488 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                                0DFF0C100B6BCEE800549488 /* test.c in Sources */,
-                               0DF377980B7BF99A00115CB0 /* fakexcode.cpp in Sources */,
                                59CBD2370BBB44DA004A3BE3 /* parsecsv.c in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               4D1EA2D70993B01000FDC1A2 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               4D1EA2EA0993B09A00FDC1A2 /* main.mm in Sources */,
-                               4D1EA31C0993B24700FDC1A2 /* ExpressController.m in Sources */,
-                               4D3ECC2709A4917000B2E45F /* WhiteBox.m in Sources */,
-                               A2122D820C7EAF6600AB87A4 /* DriveDetector.m in Sources */,
+                               27AC71850F5A0AF600053B83 /* fakexcode.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        files = (
                                59CBD2650BBB4D1B004A3BE3 /* ChapterTitles.m in Sources */,
                                4DD93F9A082036E8008E1322 /* main.mm in Sources */,
-                               4DD93F9B082036E8008E1322 /* Controller.mm in Sources */,
-                               4DD93F9C082036E8008E1322 /* PictureGLView.mm in Sources */,
-                               4DD93F9E082036E8008E1322 /* PictureController.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 */,
                                25DE1FB70C169A0C00F01FC8 /* HBPreferencesController.m in Sources */,
-                               A2DFC6770C61980700E66E89 /* MVMenuButton.m in Sources */,
                                E37C89470C83989F00C1B919 /* HBQueueController.mm in Sources */,
                                A9AC41DF0C918DB500DDF9B8 /* HBAdvancedController.m in Sources */,
+                               E37172670C977D340072B384 /* HBImageAndTextCell.m in Sources */,
+                               A22C85ED0D05D35100C10E36 /* HBPresets.m in Sources */,
+                               A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.m in Sources */,
+                               A2D18AA80FD81C50003C997B /* HBSubtitles.m in Sources */,
+                               D234BCBE1240E82800BE2E98 /* HBAudio.m in Sources */,
+                               D234BCC01240E82800BE2E98 /* HBAudioController.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-               0D6E35910B6BD5FA005AABB3 /* PBXTargetDependency */ = {
-                       isa = PBXTargetDependency;
-                       target = 0DFF0B710B6BC6E600549488 /* libhb */;
-                       targetProxy = 0D6E35900B6BD5FA005AABB3 /* PBXContainerItemProxy */;
-               };
-               0DFF0BF20B6BCCB400549488 /* PBXTargetDependency */ = {
+               277C2E540F5DFF400067D708 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = 0DFF0B710B6BC6E600549488 /* libhb */;
-                       targetProxy = 0DFF0BF10B6BCCB400549488 /* PBXContainerItemProxy */;
+                       target = 27F143770F5DF34F00A684FF /* external */;
+                       targetProxy = 277C2E530F5DFF400067D708 /* PBXContainerItemProxy */;
                };
-               0DFF0BF40B6BCCB900549488 /* PBXTargetDependency */ = {
+               277C2E560F5DFF450067D708 /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = 0DFF0B710B6BC6E600549488 /* libhb */;
-                       targetProxy = 0DFF0BF30B6BCCB900549488 /* PBXContainerItemProxy */;
+                       target = 27F143770F5DF34F00A684FF /* external */;
+                       targetProxy = 277C2E550F5DFF450067D708 /* PBXContainerItemProxy */;
                };
 /* End PBXTargetDependency section */
 
                        name = InfoPlist.strings;
                        sourceTree = "<group>";
                };
-               2538860A0BFE0B730064E995 /* OutputPanel.nib */ = {
+               A27BB4E80EFAB9310027CDF9 /* PicturePreview.xib */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               2538860B0BFE0B730064E995 /* English */,
+                               A27BB4E90EFAB9310027CDF9 /* English */,
                        );
-                       name = OutputPanel.nib;
+                       name = PicturePreview.xib;
                        sourceTree = "<group>";
                };
-               25DE1FAB0C1699E500F01FC8 /* Preferences.nib */ = {
+               E39AA4DA0D32DC0B0007A415 /* MainMenu.xib */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               25DE1FAC0C1699E500F01FC8 /* English */,
+                               E39AA4DB0D32DC0B0007A415 /* English */,
                        );
-                       name = Preferences.nib;
+                       name = MainMenu.xib;
                        sourceTree = "<group>";
                };
-               29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = {
+               E39AA4DC0D32DC0B0007A415 /* Queue.xib */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               29B97319FDCFA39411CA2CEA /* English */,
+                               E39AA4DD0D32DC0B0007A415 /* English */,
                        );
-                       name = MainMenu.nib;
+                       name = Queue.xib;
                        sourceTree = "<group>";
                };
-               A97A1DB20C91A6800015BC08 /* Express.nib */ = {
+               E39AA4DE0D32DC0B0007A415 /* Preferences.xib */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               A97A1DB30C91A6800015BC08 /* English */,
+                               E39AA4DF0D32DC0B0007A415 /* English */,
                        );
-                       name = Express.nib;
+                       name = Preferences.xib;
                        sourceTree = "<group>";
                };
-               A9AC41E50C918DC000DDF9B8 /* AdvancedView.nib */ = {
+               E39AA4E00D32DC0B0007A415 /* PictureSettings.xib */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               A9AC41E60C918DC000DDF9B8 /* English */,
+                               E39AA4E10D32DC0B0007A415 /* English */,
                        );
-                       name = AdvancedView.nib;
+                       name = PictureSettings.xib;
                        sourceTree = "<group>";
                };
-               E37C894D0C8398CF00C1B919 /* Queue.nib */ = {
+               E39AA4E20D32DC0B0007A415 /* AdvancedView.xib */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               E37C894E0C8398CF00C1B919 /* English */,
+                               E39AA4E30D32DC0B0007A415 /* English */,
                        );
-                       name = Queue.nib;
+                       name = AdvancedView.xib;
+                       sourceTree = "<group>";
+               };
+               E39AA4E40D32DC0B0007A415 /* OutputPanel.xib */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               E39AA4E50D32DC0B0007A415 /* English */,
+                       );
+                       name = OutputPanel.xib;
                        sourceTree = "<group>";
                };
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-               0D096E660B707D5800A845D4 /* Development */ = {
+               0DFF0C0D0B6BCEE000549488 /* debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
-                               COPY_PHASE_STRIP = NO;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               EXECUTABLE_PREFIX = lib;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "";
-                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
-                               INSTALL_PATH = /usr/local/lib;
-                               LIBRARY_SEARCH_PATHS = "";
-                               MACOSX_DEPLOYMENT_TARGET = 10.4;
-                               OTHER_CFLAGS = (
-                                       "-D__LIBHB__",
-                                       "-DSYS_DARWIN",
-                                       "$(OTHER_CFLAGS_QUOTED_1)",
-                                       "-DUSE_PTHREAD",
+                               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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
-                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.9.1\\\" -DHB_BUILD=22007083100";
+                               PRODUCT_NAME = HandBrakeCLI;
+                       };
+                       name = debug;
+               };
+               0DFF0C0E0B6BCEE000549488 /* standard */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
+                               INSTALL_PATH = /usr/local/bin;
                                OTHER_LDFLAGS = (
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
-                                       "-ldl",
-                                       "-flat_namespace",
-                                       "-read_only_relocs",
-                                       suppress,
+                                       "$(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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
-                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
-                               PREBINDING = NO;
-                               PRODUCT_NAME = hb;
-                               SEPARATE_STRIP = YES;
-                               ZERO_LINK = NO;
+                               PRODUCT_NAME = HandBrakeCLI;
                        };
-                       name = Development;
+                       name = standard;
                };
-               0D096E670B707D5800A845D4 /* Deployment */ = {
+               27B4DEB20F65BAB600098046 /* standard.i386 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
-                               COPY_PHASE_STRIP = YES;
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               EXECUTABLE_PREFIX = lib;
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
+                               ARCHS = i386;
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               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_INLINES_ARE_PRIVATE_EXTERN = NO;
                                GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "";
-                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
-                               INSTALL_PATH = /usr/local/lib;
-                               LIBRARY_SEARCH_PATHS = "";
-                               MACOSX_DEPLOYMENT_TARGET = 10.4;
-                               OTHER_CFLAGS = (
-                                       "-D__LIBHB__",
-                                       "-DSYS_DARWIN",
-                                       "$(OTHER_CFLAGS_QUOTED_1)",
-                                       "-DUSE_PTHREAD",
-                               );
-                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.9.1\\\" -DHB_BUILD=22007083100";
-                               OTHER_LDFLAGS = (
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
-                                       "-ldl",
-                                       "-flat_namespace",
-                                       "-read_only_relocs",
-                                       suppress,
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
                                );
-                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
                                PREBINDING = NO;
-                               PRODUCT_NAME = hb;
-                               SEPARATE_STRIP = YES;
-                               ZERO_LINK = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
                        };
-                       name = Deployment;
+                       name = standard.i386;
                };
-               0D096E680B707D5800A845D4 /* Default */ = {
+               27B4DEB30F65BAB600098046 /* standard.i386 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               EXECUTABLE_PREFIX = lib;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "";
-                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
-                               INSTALL_PATH = /usr/local/lib;
-                               LIBRARY_SEARCH_PATHS = "";
-                               MACOSX_DEPLOYMENT_TARGET = 10.4;
-                               OTHER_CFLAGS = (
-                                       "-D__LIBHB__",
-                                       "-DSYS_DARWIN",
-                                       "$(OTHER_CFLAGS_QUOTED_1)",
-                                       "-DUSE_PTHREAD",
-                               );
-                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.9.1\\\" -DHB_BUILD=22007083100";
+                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
+                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
+                               INFOPLIST_FILE = Info.plist;
+                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
+                               INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
+                               INFOPLIST_PREPROCESS = YES;
                                OTHER_LDFLAGS = (
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
-                                       "-ldl",
-                                       "-flat_namespace",
-                                       "-read_only_relocs",
-                                       suppress,
+                                       "$(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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
-                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
-                               PREBINDING = NO;
-                               PRODUCT_NAME = hb;
-                               SEPARATE_STRIP = YES;
-                               ZERO_LINK = NO;
+                               PRODUCT_NAME = HandBrake;
+                               WARNING_CFLAGS = (
+                                       "-Wmost",
+                                       "-Wno-four-char-constants",
+                                       "-Wno-unknown-pragmas",
+                               );
+                               WRAPPER_EXTENSION = app;
                        };
-                       name = Default;
+                       name = standard.i386;
                };
-               0D096E690B707D5800A845D4 /* UB */ = {
+               27B4DEB40F65BAB600098046 /* standard.i386 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               EXECUTABLE_PREFIX = lib;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "";
-                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
-                               INSTALL_PATH = /usr/local/lib;
-                               LIBRARY_SEARCH_PATHS = "";
-                               MACOSX_DEPLOYMENT_TARGET = 10.4;
-                               OTHER_CFLAGS = (
-                                       "-D__LIBHB__",
-                                       "-DSYS_DARWIN",
-                                       "$(OTHER_CFLAGS_QUOTED_1)",
-                                       "-DUSE_PTHREAD",
-                               );
-                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.9.1\\\" -DHB_BUILD=22007083100";
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
+                               INSTALL_PATH = /usr/local/bin;
                                OTHER_LDFLAGS = (
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
-                                       "-ldl",
-                                       "-flat_namespace",
-                                       "-read_only_relocs",
-                                       suppress,
+                                       "$(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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
-                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
-                               PREBINDING = NO;
-                               PRODUCT_NAME = hb;
-                               SEPARATE_STRIP = YES;
-                               ZERO_LINK = NO;
+                               PRODUCT_NAME = HandBrakeCLI;
                        };
-                       name = UB;
+                       name = standard.i386;
                };
-               0D88F56B0B6CDCD400F81F26 /* UB */ = {
+               27B4DEB50F65BAB600098046 /* standard.i386 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               PRODUCT_NAME = external;
+                       };
+                       name = standard.i386;
+               };
+               27B4DEB60F65BAB600098046 /* standard.i386 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = standard.i386;
+               };
+               27B4DEB70F65BAB600098046 /* standard.i386 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = standard.i386;
+               };
+               27B4DEB80F65BAB700098046 /* standard.x86_64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = x86_64;
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               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;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "";
-                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
-                               INSTALL_PATH = /usr/local/lib;
-                               MACOSX_DEPLOYMENT_TARGET = 10.3;
-                               OTHER_CFLAGS = (
-                                       "-D__LIBHB__",
-                                       "-DSYS_DARWIN",
-                                       "$(OTHER_CFLAGS_QUOTED_1)",
-                                       "-DUSE_PTHREAD",
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
                                );
-                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.9.1\\\" -DHB_BUILD=2007083100";
-                               OTHER_LDFLAGS = "";
-                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
                                PREBINDING = NO;
-                               PRODUCT_NAME = hb;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                               ZERO_LINK = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
                        };
-                       name = UB;
+                       name = standard.x86_64;
                };
-               0D88F56C0B6CDCD400F81F26 /* UB */ = {
+               27B4DEB90F65BAB700098046 /* standard.x86_64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = ..;
-                               CURRENT_PROJECT_VERSION = 0.9.1;
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-                               );
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-                               HEADER_SEARCH_PATHS = (
-                                       ../libhb,
-                                       ../contrib/include,
-                               );
-                               INFOPLIST_FILE = HandBrake.plist;
-                               LIBRARY_SEARCH_PATHS = "";
-                               MACOSX_DEPLOYMENT_TARGET = 10.4;
-                               OTHER_CFLAGS = "";
+                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
+                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
+                               INFOPLIST_FILE = Info.plist;
+                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
+                               INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
+                               INFOPLIST_PREPROCESS = YES;
                                OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
+                                       "$(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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(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;
-                               SECTORDER_FLAGS = "";
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                );
                                WRAPPER_EXTENSION = app;
                        };
-                       name = UB;
+                       name = standard.x86_64;
                };
-               0D88F56D0B6CDCD400F81F26 /* UB */ = {
+               27B4DEBA0F65BAB700098046 /* standard.x86_64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = ..;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(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;
+                       };
+                       name = standard.x86_64;
+               };
+               27B4DEBB0F65BAB700098046 /* standard.x86_64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = external;
+                       };
+                       name = standard.x86_64;
+               };
+               27B4DEBC0F65BAB700098046 /* standard.x86_64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = standard.x86_64;
+               };
+               27B4DEBD0F65BAB700098046 /* standard.x86_64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = standard.x86_64;
+               };
+               27B4DEBE0F65BAB800098046 /* standard.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = ppc;
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               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;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                               HEADER_SEARCH_PATHS = ../libhb;
-                               INFOPLIST_FILE = Express.plist;
-                               INSTALL_PATH = "$(HOME)/Applications";
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
                                LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
                                );
-                               LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
+                               PREBINDING = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
+                       };
+                       name = standard.ppc;
+               };
+               27B4DEBF0F65BAB800098046 /* standard.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
+                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
+                               INFOPLIST_FILE = Info.plist;
+                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
+                               INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
+                               INFOPLIST_PREPROCESS = YES;
                                OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
+                                       "$(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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(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 = (
+                                       "-Wmost",
+                                       "-Wno-four-char-constants",
+                                       "-Wno-unknown-pragmas",
                                );
-                               PREBINDING = NO;
-                               PRODUCT_NAME = "Instant HandBrake";
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                                WRAPPER_EXTENSION = app;
-                               ZERO_LINK = NO;
                        };
-                       name = UB;
+                       name = standard.ppc;
                };
-               0D88F56E0B6CDCD400F81F26 /* UB */ = {
+               27B4DEC00F65BAB800098046 /* standard.ppc */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = ..;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               HEADER_SEARCH_PATHS = ../libhb;
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
-                               LIBRARY_SEARCH_PATHS = "";
-                               OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       "-lz",
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
+                                       "$(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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
-                               PREBINDING = NO;
                                PRODUCT_NAME = HandBrakeCLI;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                               ZERO_LINK = NO;
                        };
-                       name = UB;
+                       name = standard.ppc;
                };
-               0D88F56F0B6CDCD400F81F26 /* UB */ = {
+               27B4DEC10F65BAB800098046 /* standard.ppc */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = (
-                                       ppc,
-                                       i386,
-                               );
-                               GCC_PREPROCESSOR_DEFINITIONS = "JOB_GROUPS=1";
-                               MACOSX_DEPLOYMENT_TARGET = 10.3;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               PRODUCT_NAME = external;
                        };
-                       name = UB;
+                       name = standard.ppc;
                };
-               0DFF0B740B6BC70400549488 /* Development */ = {
+               27B4DEC20F65BAB800098046 /* standard.ppc */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
-                               COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = standard.ppc;
+               };
+               27B4DEC30F65BAB800098046 /* standard.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = standard.ppc;
+               };
+               27B4DEC40F65BAB900098046 /* standard.ppc64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = ppc64;
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               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;
-                               GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "";
-                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
-                               INSTALL_PATH = /usr/local/lib;
-                               MACOSX_DEPLOYMENT_TARGET = 10.3;
-                               OTHER_CFLAGS = (
-                                       "-D__LIBHB__",
-                                       "-DSYS_DARWIN",
-                                       "$(OTHER_CFLAGS_QUOTED_1)",
-                                       "-DUSE_PTHREAD",
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
                                );
-                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.9.0\\\" -DHB_BUILD=2007081900";
-                               OTHER_LDFLAGS = "";
-                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
                                PREBINDING = NO;
-                               PRODUCT_NAME = hb;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                               ZERO_LINK = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
                        };
-                       name = Development;
+                       name = standard.ppc64;
                };
-               0DFF0B750B6BC70400549488 /* Deployment */ = {
+               27B4DEC50F65BAB900098046 /* standard.ppc64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
-                               COPY_PHASE_STRIP = YES;
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "";
-                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
-                               INSTALL_PATH = /usr/local/lib;
-                               MACOSX_DEPLOYMENT_TARGET = 10.3;
-                               OTHER_CFLAGS = (
-                                       "-D__LIBHB__",
-                                       "-DSYS_DARWIN",
-                                       "$(OTHER_CFLAGS_QUOTED_1)",
-                                       "-DUSE_PTHREAD",
+                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
+                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
+                               INFOPLIST_FILE = Info.plist;
+                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
+                               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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
-                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.9.0\\\" -DHB_BUILD=2007081900";
-                               OTHER_LDFLAGS = "";
-                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
-                               PREBINDING = NO;
-                               PRODUCT_NAME = hb;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                               ZERO_LINK = NO;
+                               PRODUCT_NAME = HandBrake;
+                               WARNING_CFLAGS = (
+                                       "-Wmost",
+                                       "-Wno-four-char-constants",
+                                       "-Wno-unknown-pragmas",
+                               );
+                               WRAPPER_EXTENSION = app;
                        };
-                       name = Deployment;
+                       name = standard.ppc64;
                };
-               0DFF0B760B6BC70400549488 /* Default */ = {
+               27B4DEC60F65BAB900098046 /* standard.ppc64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../libhb";
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "";
-                               HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../contrib/include";
-                               INSTALL_PATH = /usr/local/lib;
-                               MACOSX_DEPLOYMENT_TARGET = 10.3;
-                               OTHER_CFLAGS = (
-                                       "-D__LIBHB__",
-                                       "-DSYS_DARWIN",
-                                       "$(OTHER_CFLAGS_QUOTED_1)",
-                                       "-DUSE_PTHREAD",
+                               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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
-                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.9.0\\\" -DHB_BUILD=2007081900";
-                               OTHER_LDFLAGS = "";
-                               PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
-                               PREBINDING = NO;
-                               PRODUCT_NAME = hb;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                               ZERO_LINK = NO;
+                               PRODUCT_NAME = HandBrakeCLI;
                        };
-                       name = Default;
+                       name = standard.ppc64;
                };
-               0DFF0C0D0B6BCEE000549488 /* Development */ = {
+               27B4DEC70F65BAB900098046 /* standard.ppc64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = ..;
+                               PRODUCT_NAME = external;
+                       };
+                       name = standard.ppc64;
+               };
+               27B4DEC80F65BAB900098046 /* standard.ppc64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = standard.ppc64;
+               };
+               27B4DEC90F65BAB900098046 /* standard.ppc64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = standard.ppc64;
+               };
+               27B4DECA0F65BABC00098046 /* debug.i386 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = i386;
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
                                COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               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_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               HEADER_SEARCH_PATHS = ../libhb;
-                               INSTALL_PATH = /usr/local/bin;
-                               LIBRARY_SEARCH_PATHS = "";
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       "-lz",
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
                                );
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
                                PREBINDING = NO;
-                               PRODUCT_NAME = HandBrakeCLI;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                               ZERO_LINK = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               STRIP_INSTALLED_PRODUCT = NO;
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
                        };
-                       name = Development;
+                       name = debug.i386;
                };
-               0DFF0C0E0B6BCEE000549488 /* Deployment */ = {
+               27B4DECB0F65BABC00098046 /* debug.i386 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = ..;
-                               COPY_PHASE_STRIP = YES;
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               HEADER_SEARCH_PATHS = ../libhb;
-                               INSTALL_PATH = /usr/local/bin;
-                               LIBRARY_SEARCH_PATHS = "";
-                               OTHER_CFLAGS = "";
+                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
+                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
+                               INFOPLIST_FILE = Info.plist;
+                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
+                               INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
+                               INFOPLIST_PREPROCESS = YES;
                                OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       "-lz",
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
+                                       "$(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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
-                               PREBINDING = NO;
-                               PRODUCT_NAME = HandBrakeCLI;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                               ZERO_LINK = NO;
+                               PRODUCT_NAME = HandBrake;
+                               WARNING_CFLAGS = (
+                                       "-Wmost",
+                                       "-Wno-four-char-constants",
+                                       "-Wno-unknown-pragmas",
+                               );
+                               WRAPPER_EXTENSION = app;
                        };
-                       name = Deployment;
+                       name = debug.i386;
                };
-               0DFF0C0F0B6BCEE000549488 /* Default */ = {
+               27B4DECC0F65BABC00098046 /* debug.i386 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = ..;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               HEADER_SEARCH_PATHS = ../libhb;
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
                                INSTALL_PATH = /usr/local/bin;
-                               LIBRARY_SEARCH_PATHS = "";
-                               OTHER_CFLAGS = "";
                                OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       "-lz",
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
+                                       "$(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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
-                               PREBINDING = NO;
                                PRODUCT_NAME = HandBrakeCLI;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                               ZERO_LINK = NO;
                        };
-                       name = Default;
+                       name = debug.i386;
+               };
+               27B4DECD0F65BABC00098046 /* debug.i386 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = external;
+                       };
+                       name = debug.i386;
+               };
+               27B4DECE0F65BABC00098046 /* debug.i386 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = debug.i386;
+               };
+               27B4DECF0F65BABC00098046 /* debug.i386 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = debug.i386;
                };
-               4D1EA2DE0993B01100FDC1A2 /* Development */ = {
+               27B4DED00F65BABD00098046 /* debug.x86_64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               ARCHS = x86_64;
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
                                COPY_PHASE_STRIP = NO;
-                               GCC_DYNAMIC_NO_PIC = NO;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               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_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                               HEADER_SEARCH_PATHS = ../libhb;
-                               INFOPLIST_FILE = Express.plist;
-                               INSTALL_PATH = "$(HOME)/Applications";
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
                                LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
                                );
-                               LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
+                               PREBINDING = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               STRIP_INSTALLED_PRODUCT = NO;
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
+                       };
+                       name = debug.x86_64;
+               };
+               27B4DED10F65BABD00098046 /* debug.x86_64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
+                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
+                               INFOPLIST_FILE = Info.plist;
+                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
+                               INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
+                               INFOPLIST_PREPROCESS = YES;
                                OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
+                                       "$(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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(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 = (
+                                       "-Wmost",
+                                       "-Wno-four-char-constants",
+                                       "-Wno-unknown-pragmas",
                                );
-                               PREBINDING = NO;
-                               PRODUCT_NAME = "Instant HandBrake";
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                                WRAPPER_EXTENSION = app;
-                               ZERO_LINK = NO;
                        };
-                       name = Development;
+                       name = debug.x86_64;
                };
-               4D1EA2DF0993B01100FDC1A2 /* Deployment */ = {
+               27B4DED20F65BABD00098046 /* debug.x86_64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               COPY_PHASE_STRIP = YES;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                               HEADER_SEARCH_PATHS = ../libhb;
-                               INFOPLIST_FILE = Express.plist;
-                               INSTALL_PATH = "$(HOME)/Applications";
-                               LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
-                               );
-                               LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
+                               GCC_C_LANGUAGE_STANDARD = "compiler-default";
+                               INSTALL_PATH = /usr/local/bin;
                                OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
+                                       "$(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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
-                               PREBINDING = NO;
-                               PRODUCT_NAME = "Instant HandBrake";
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                               WRAPPER_EXTENSION = app;
-                               ZERO_LINK = NO;
+                               PRODUCT_NAME = HandBrakeCLI;
+                       };
+                       name = debug.x86_64;
+               };
+               27B4DED30F65BABD00098046 /* debug.x86_64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = external;
                        };
-                       name = Deployment;
+                       name = debug.x86_64;
                };
-               4D1EA2E00993B01100FDC1A2 /* Default */ = {
+               27B4DED40F65BABD00098046 /* debug.x86_64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = debug.x86_64;
+               };
+               27B4DED50F65BABD00098046 /* debug.x86_64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = debug.x86_64;
+               };
+               27B4DED60F65BABD00098046 /* debug.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = ppc;
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               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_MODEL_TUNING = G5;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-                               HEADER_SEARCH_PATHS = ../libhb;
-                               INFOPLIST_FILE = Express.plist;
-                               INSTALL_PATH = "$(HOME)/Applications";
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
                                LIBRARY_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
                                );
-                               LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
+                               PREBINDING = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               STRIP_INSTALLED_PRODUCT = NO;
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
+                       };
+                       name = debug.ppc;
+               };
+               27B4DED70F65BABD00098046 /* debug.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
+                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
+                               INFOPLIST_FILE = Info.plist;
+                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
+                               INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
+                               INFOPLIST_PREPROCESS = YES;
                                OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
+                                       "$(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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(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 = (
+                                       "-Wmost",
+                                       "-Wno-four-char-constants",
+                                       "-Wno-unknown-pragmas",
                                );
-                               PREBINDING = NO;
-                               PRODUCT_NAME = "Instant HandBrake";
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                                WRAPPER_EXTENSION = app;
-                               ZERO_LINK = NO;
                        };
-                       name = Default;
+                       name = debug.ppc;
                };
-               4D4E7BC1087804870051572B /* Development */ = {
+               27B4DED80F65BABD00098046 /* debug.ppc */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = ..;
-                               COPY_PHASE_STRIP = NO;
-                               CURRENT_PROJECT_VERSION = 0.9.1;
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
+                               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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
+                               PRODUCT_NAME = HandBrakeCLI;
+                       };
+                       name = debug.ppc;
+               };
+               27B4DED90F65BABD00098046 /* debug.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = external;
+                       };
+                       name = debug.ppc;
+               };
+               27B4DEDA0F65BABD00098046 /* debug.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = debug.ppc;
+               };
+               27B4DEDB0F65BABD00098046 /* debug.ppc */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = debug.ppc;
+               };
+               27B4DEDC0F65BABD00098046 /* debug.ppc64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ARCHS = ppc64;
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               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 = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-                               HEADER_SEARCH_PATHS = (
-                                       ../libhb,
-                                       ../contrib/include,
+                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
                                );
-                               INFOPLIST_FILE = HandBrake.plist;
-                               LIBRARY_SEARCH_PATHS = "";
-                               MACOSX_DEPLOYMENT_TARGET = 10.4;
-                               OTHER_CFLAGS = "";
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
+                               PREBINDING = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               STRIP_INSTALLED_PRODUCT = NO;
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
+                       };
+                       name = debug.ppc64;
+               };
+               27B4DEDD0F65BABD00098046 /* debug.ppc64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
+                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
+                               INFOPLIST_FILE = Info.plist;
+                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
+                               INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
+                               INFOPLIST_PREPROCESS = YES;
                                OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
+                                       "$(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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(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;
-                               SECTORDER_FLAGS = "";
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                        "-Wno-unknown-pragmas",
                                );
                                WRAPPER_EXTENSION = app;
-                               ZERO_LINK = NO;
                        };
-                       name = Development;
+                       name = debug.ppc64;
                };
-               4D4E7BC2087804870051572B /* Deployment */ = {
+               27B4DEDE0F65BABD00098046 /* debug.ppc64 */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = ..;
-                               COPY_PHASE_STRIP = YES;
-                               CURRENT_PROJECT_VERSION = 0.9.1;
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-                               );
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-                               HEADER_SEARCH_PATHS = (
-                                       ../libhb,
-                                       ../contrib/include,
+                               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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbis.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libvorbisenc.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libx264.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libxml2.a",
                                );
-                               INFOPLIST_FILE = HandBrake.plist;
-                               LIBRARY_SEARCH_PATHS = "";
-                               MACOSX_DEPLOYMENT_TARGET = 10.4;
-                               OTHER_CFLAGS = "";
+                               PRODUCT_NAME = HandBrakeCLI;
+                       };
+                       name = debug.ppc64;
+               };
+               27B4DEDF0F65BABD00098046 /* debug.ppc64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = external;
+                       };
+                       name = debug.ppc64;
+               };
+               27B4DEE00F65BABD00098046 /* debug.ppc64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = debug.ppc64;
+               };
+               27B4DEE10F65BABD00098046 /* debug.ppc64 */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = debug.ppc64;
+               };
+               27F143780F5DF34F00A684FF /* standard */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = external;
+                       };
+                       name = standard;
+               };
+               27F143790F5DF34F00A684FF /* debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = external;
+                       };
+                       name = debug;
+               };
+               27F1437F0F5DF36000A684FF /* standard */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = standard;
+               };
+               27F143800F5DF36000A684FF /* debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = contrib;
+                       };
+                       name = debug;
+               };
+               27F143860F5DF37600A684FF /* standard */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = standard;
+               };
+               27F143870F5DF37600A684FF /* debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               PRODUCT_NAME = libhb;
+                       };
+                       name = debug;
+               };
+               4D4E7BC1087804870051572B /* debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
+                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
+                               INFOPLIST_FILE = Info.plist;
+                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
+                               INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
+                               INFOPLIST_PREPROCESS = YES;
                                OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
+                                       "$(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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(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;
-                               SECTORDER_FLAGS = "";
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                        "-Wno-unknown-pragmas",
                                );
                                WRAPPER_EXTENSION = app;
-                               ZERO_LINK = NO;
                        };
-                       name = Deployment;
+                       name = debug;
                };
-               4D4E7BC3087804870051572B /* Default */ = {
+               4D4E7BC2087804870051572B /* standard */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               CONFIGURATION_BUILD_DIR = ..;
-                               CURRENT_PROJECT_VERSION = 0.9.1;
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(inherited)",
-                                       "$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-                               );
-                               FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\"";
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-                               HEADER_SEARCH_PATHS = (
-                                       ../libhb,
-                                       ../contrib/include,
-                               );
-                               INFOPLIST_FILE = HandBrake.plist;
-                               LIBRARY_SEARCH_PATHS = "";
-                               MACOSX_DEPLOYMENT_TARGET = 10.4;
-                               OTHER_CFLAGS = "";
+                               IBC_PLUGINS = /System/Library/Frameworks/QTKit.framework/Resources/QTKitIBPlugin.ibplugin;
+                               IBC_PLUGIN_SEARCH_PATHS = /System/Library/Frameworks/QTKit.framework/Resources;
+                               INFOPLIST_FILE = Info.plist;
+                               INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional -undef";
+                               INFOPLIST_PREFIX_HEADER = "$(EXTERNAL_BUILD)/macosx/Info.h";
+                               INFOPLIST_PREPROCESS = YES;
                                OTHER_LDFLAGS = (
-                                       ../libhb/libhb.a,
-                                       ../contrib/lib/libmp4v2.a,
-                                       ../contrib/lib/liba52.a,
-                                       ../contrib/lib/libavformat.a,
-                                       ../contrib/lib/libavcodec.a,
-                                       ../contrib/lib/libavutil.a,
-                                       ../contrib/lib/libdvdread.a,
-                                       ../contrib/lib/libdvdcss.a,
-                                       ../contrib/lib/libfaac.a,
-                                       ../contrib/lib/libmp3lame.a,
-                                       ../contrib/lib/libmpeg2.a,
-                                       ../contrib/lib/libvorbis.a,
-                                       ../contrib/lib/libvorbisenc.a,
-                                       ../contrib/lib/libogg.a,
-                                       ../contrib/lib/libsamplerate.a,
-                                       ../contrib/lib/libx264.a,
-                                       ../contrib/lib/libxvidcore.a,
-                                       ../contrib/lib/libdca.a,
-                                       ../contrib/lib/libmkv.a,
-                                       ../contrib/lib/libswscale.a,
+                                       "$(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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libfaac.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",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libogg.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libmpeg2.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libsamplerate.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libswscale.a",
+                                       "$(EXTERNAL_BUILD)/contrib/lib/libtheora.a",
+                                       "$(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;
-                               SECTORDER_FLAGS = "";
                                WARNING_CFLAGS = (
                                        "-Wmost",
                                        "-Wno-four-char-constants",
                                );
                                WRAPPER_EXTENSION = app;
                        };
-                       name = Default;
+                       name = standard;
                };
-               4D4E7BC5087804870051572B /* Development */ = {
+               4D4E7BC5087804870051572B /* debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
+                               COPY_PHASE_STRIP = NO;
                                DEBUG_INFORMATION_FORMAT = dwarf;
-                               GCC_DEBUGGING_SYMBOLS = default;
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               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;
-                               MACOSX_DEPLOYMENT_TARGET = 10.3;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
+                               );
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
                                PREBINDING = NO;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                               ZERO_LINK = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               STRIP_INSTALLED_PRODUCT = NO;
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
                        };
-                       name = Development;
+                       name = debug;
                };
-               4D4E7BC6087804870051572B /* Deployment */ = {
+               4D4E7BC6087804870051572B /* standard */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               GCC_PREPROCESSOR_DEFINITIONS = "JOB_GROUPS=1";
-                               MACOSX_DEPLOYMENT_TARGET = 10.3;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                       };
-                       name = Deployment;
-               };
-               4D4E7BC7087804870051572B /* Default */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               GCC_PREPROCESSOR_DEFINITIONS = "JOB_GROUPS=1";
-                               MACOSX_DEPLOYMENT_TARGET = 10.3;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               CONFIGURATION_BUILD_DIR = "$(EXTERNAL_BUILD)";
+                               CONFIGURATION_TEMP_DIR = "$(SYMROOT)";
+                               EXTERNAL_BUILD = "$(EXTERNAL_SRC)/build.$(CONFIGURATION)";
+                               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;
+                               GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES;
+                               HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb";
+                               IBC_NOTICES = NO;
+                               IBC_WARNINGS = NO;
+                               LIBRARY_SEARCH_PATHS = (
+                                       "$(EXTERNAL_BUILD)/libhb",
+                                       "$(EXTERNAL_BUILD)/contrib/lib",
+                               );
+                               OBJROOT = "$(EXTERNAL_BUILD)/macosx";
+                               PREBINDING = NO;
+                               SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
+                               SHARED_PRECOMPS_DIR = "$(SYMROOT)/cache";
+                               SYMROOT = "$(EXTERNAL_BUILD)/macosx";
                        };
-                       name = Default;
+                       name = standard;
                };
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-               0D096E650B707D5800A845D4 /* Build configuration list for PBXNativeTarget "libhb dlib" */ = {
+               0DFF0C0C0B6BCEE000549488 /* Build configuration list for PBXNativeTarget "HandBrakeCLI" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               0D096E660B707D5800A845D4 /* Development */,
-                               0D096E670B707D5800A845D4 /* Deployment */,
-                               0D096E680B707D5800A845D4 /* Default */,
-                               0D096E690B707D5800A845D4 /* UB */,
+                               0DFF0C0E0B6BCEE000549488 /* standard */,
+                               27B4DEB40F65BAB600098046 /* standard.i386 */,
+                               27B4DEBA0F65BAB700098046 /* standard.x86_64 */,
+                               27B4DEC00F65BAB800098046 /* standard.ppc */,
+                               27B4DEC60F65BAB900098046 /* standard.ppc64 */,
+                               0DFF0C0D0B6BCEE000549488 /* debug */,
+                               27B4DECC0F65BABC00098046 /* debug.i386 */,
+                               27B4DED20F65BABD00098046 /* debug.x86_64 */,
+                               27B4DED80F65BABD00098046 /* debug.ppc */,
+                               27B4DEDE0F65BABD00098046 /* debug.ppc64 */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Default;
+                       defaultConfigurationName = standard;
                };
-               0DFF0B730B6BC70400549488 /* Build configuration list for PBXNativeTarget "libhb" */ = {
+               27F1438E0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "external" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               0DFF0B740B6BC70400549488 /* Development */,
-                               0DFF0B750B6BC70400549488 /* Deployment */,
-                               0DFF0B760B6BC70400549488 /* Default */,
-                               0D88F56B0B6CDCD400F81F26 /* UB */,
+                               27F143780F5DF34F00A684FF /* standard */,
+                               27B4DEB50F65BAB600098046 /* standard.i386 */,
+                               27B4DEBB0F65BAB700098046 /* standard.x86_64 */,
+                               27B4DEC10F65BAB800098046 /* standard.ppc */,
+                               27B4DEC70F65BAB900098046 /* standard.ppc64 */,
+                               27F143790F5DF34F00A684FF /* debug */,
+                               27B4DECD0F65BABC00098046 /* debug.i386 */,
+                               27B4DED30F65BABD00098046 /* debug.x86_64 */,
+                               27B4DED90F65BABD00098046 /* debug.ppc */,
+                               27B4DEDF0F65BABD00098046 /* debug.ppc64 */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Default;
+                       defaultConfigurationName = standard;
                };
-               0DFF0C0C0B6BCEE000549488 /* Build configuration list for PBXNativeTarget "HandBrakeCLI" */ = {
+               27F1438F0F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "contrib" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               0DFF0C0D0B6BCEE000549488 /* Development */,
-                               0DFF0C0E0B6BCEE000549488 /* Deployment */,
-                               0DFF0C0F0B6BCEE000549488 /* Default */,
-                               0D88F56E0B6CDCD400F81F26 /* UB */,
+                               27F1437F0F5DF36000A684FF /* standard */,
+                               27B4DEB70F65BAB600098046 /* standard.i386 */,
+                               27B4DEBD0F65BAB700098046 /* standard.x86_64 */,
+                               27B4DEC30F65BAB800098046 /* standard.ppc */,
+                               27B4DEC90F65BAB900098046 /* standard.ppc64 */,
+                               27F143800F5DF36000A684FF /* debug */,
+                               27B4DECF0F65BABC00098046 /* debug.i386 */,
+                               27B4DED50F65BABD00098046 /* debug.x86_64 */,
+                               27B4DEDB0F65BABD00098046 /* debug.ppc */,
+                               27B4DEE10F65BABD00098046 /* debug.ppc64 */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Default;
+                       defaultConfigurationName = standard;
                };
-               4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "Instant HandBrake" */ = {
+               27F143900F5DF3EA00A684FF /* Build configuration list for PBXLegacyTarget "libhb" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               4D1EA2DE0993B01100FDC1A2 /* Development */,
-                               4D1EA2DF0993B01100FDC1A2 /* Deployment */,
-                               4D1EA2E00993B01100FDC1A2 /* Default */,
-                               0D88F56D0B6CDCD400F81F26 /* UB */,
+                               27F143860F5DF37600A684FF /* standard */,
+                               27B4DEB60F65BAB600098046 /* standard.i386 */,
+                               27B4DEBC0F65BAB700098046 /* standard.x86_64 */,
+                               27B4DEC20F65BAB800098046 /* standard.ppc */,
+                               27B4DEC80F65BAB900098046 /* standard.ppc64 */,
+                               27F143870F5DF37600A684FF /* debug */,
+                               27B4DECE0F65BABC00098046 /* debug.i386 */,
+                               27B4DED40F65BABD00098046 /* debug.x86_64 */,
+                               27B4DEDA0F65BABD00098046 /* debug.ppc */,
+                               27B4DEE00F65BABD00098046 /* debug.ppc64 */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Default;
+                       defaultConfigurationName = standard;
                };
                4D4E7BC0087804870051572B /* Build configuration list for PBXNativeTarget "HandBrake" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               4D4E7BC1087804870051572B /* Development */,
-                               4D4E7BC2087804870051572B /* Deployment */,
-                               4D4E7BC3087804870051572B /* Default */,
-                               0D88F56C0B6CDCD400F81F26 /* UB */,
+                               4D4E7BC2087804870051572B /* standard */,
+                               27B4DEB30F65BAB600098046 /* standard.i386 */,
+                               27B4DEB90F65BAB700098046 /* standard.x86_64 */,
+                               27B4DEBF0F65BAB800098046 /* standard.ppc */,
+                               27B4DEC50F65BAB900098046 /* standard.ppc64 */,
+                               4D4E7BC1087804870051572B /* debug */,
+                               27B4DECB0F65BABC00098046 /* debug.i386 */,
+                               27B4DED10F65BABD00098046 /* debug.x86_64 */,
+                               27B4DED70F65BABD00098046 /* debug.ppc */,
+                               27B4DEDD0F65BABD00098046 /* debug.ppc64 */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Default;
+                       defaultConfigurationName = standard;
                };
                4D4E7BC4087804870051572B /* Build configuration list for PBXProject "HandBrake" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               4D4E7BC5087804870051572B /* Development */,
-                               4D4E7BC6087804870051572B /* Deployment */,
-                               4D4E7BC7087804870051572B /* Default */,
-                               0D88F56F0B6CDCD400F81F26 /* UB */,
+                               4D4E7BC6087804870051572B /* standard */,
+                               27B4DEB20F65BAB600098046 /* standard.i386 */,
+                               27B4DEB80F65BAB700098046 /* standard.x86_64 */,
+                               27B4DEBE0F65BAB800098046 /* standard.ppc */,
+                               27B4DEC40F65BAB900098046 /* standard.ppc64 */,
+                               4D4E7BC5087804870051572B /* debug */,
+                               27B4DECA0F65BABC00098046 /* debug.i386 */,
+                               27B4DED00F65BABD00098046 /* debug.x86_64 */,
+                               27B4DED60F65BABD00098046 /* debug.ppc */,
+                               27B4DEDC0F65BABD00098046 /* debug.ppc64 */,
                        );
                        defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Default;
+                       defaultConfigurationName = standard;
                };
 /* End XCConfigurationList section */
        };