X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=macosx%2FHandBrake.xcodeproj%2Fproject.pbxproj;h=c851352335fcb0ef2ed935a730fdaa81b3106104;hb=4b72a63eb61a01275493c4bfb51ba02152d1c5e1;hp=ce2d2602a35743bdd9d8a587924a162a9a88b3a0;hpb=d6a4ae73b86cca10f2342c9e26c132855cad6356;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index ce2d2602..c8513523 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -30,8 +30,8 @@
 		4DD93F92082036E8008E1322 /* HBPreviewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D1FD381073D19CE00E46515 /* HBPreviewController.h */; };
 		4DD93F97082036E8008E1322 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		4DD93F9A082036E8008E1322 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; settings = {ATTRIBUTES = (); }; };
-		4DD93F9B082036E8008E1322 /* Controller.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4DF3C8CC052889CD00A80101 /* Controller.mm */; };
-		4DD93F9E082036E8008E1322 /* HBPreviewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4D1FD382073D19CE00E46515 /* HBPreviewController.mm */; };
+		4DD93F9B082036E8008E1322 /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DF3C8CC052889CD00A80101 /* Controller.m */; };
+		4DD93F9E082036E8008E1322 /* HBPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1FD382073D19CE00E46515 /* HBPreviewController.m */; };
 		4DD93FA2082036E8008E1322 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 		4DD93FA3082036E8008E1322 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DEB2024052B055F00C39CA9 /* IOKit.framework */; };
 		4DD93FA4082036E8008E1322 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */; };
@@ -51,7 +51,7 @@
 		A2A1EC310C76C35E00827E0D /* HBDVDDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */; };
 		A2A1EC3A0C76C58400827E0D /* HBDVDDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A1EC390C76C58400827E0D /* HBDVDDetector.m */; };
 		A2BEA5FB0F2A1ED1001CE7A1 /* PictureController.h in Headers */ = {isa = PBXBuildFile; fileRef = A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */; };
-		A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */; };
+		A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */; };
 		A2D0A0AB0D3E5929002D57CB /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */; };
 		A2D0A0BF0D3E596F002D57CB /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */; };
 		A2D18AA70FD81C50003C997B /* HBSubtitles.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D18AA50FD81C50003C997B /* HBSubtitles.h */; };
@@ -67,6 +67,10 @@
 		A906A0520F7A7B210007A827 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A906A0500F7A7B210007A827 /* AudioToolbox.framework */; };
 		A9AC41DF0C918DB500DDF9B8 /* HBAdvancedController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9AC41DD0C918DB500DDF9B8 /* HBAdvancedController.m */; };
 		A9AC41E00C918DB500DDF9B8 /* HBAdvancedController.h in Headers */ = {isa = PBXBuildFile; fileRef = A9AC41DE0C918DB500DDF9B8 /* HBAdvancedController.h */; };
+		D234BCBD1240E82800BE2E98 /* HBAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = D234BCB91240E82800BE2E98 /* HBAudio.h */; };
+		D234BCBE1240E82800BE2E98 /* HBAudio.m in Sources */ = {isa = PBXBuildFile; fileRef = D234BCBA1240E82800BE2E98 /* HBAudio.m */; };
+		D234BCBF1240E82800BE2E98 /* HBAudioController.h in Headers */ = {isa = PBXBuildFile; fileRef = D234BCBB1240E82800BE2E98 /* HBAudioController.h */; };
+		D234BCC01240E82800BE2E98 /* HBAudioController.m in Sources */ = {isa = PBXBuildFile; fileRef = D234BCBC1240E82800BE2E98 /* HBAudioController.m */; };
 		D289A9F30DBBE7AC00CE614B /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D289A9F20DBBE7AC00CE614B /* CoreServices.framework */; };
 		D289AAC40DBBF3F100CE614B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DEB2024052B055F00C39CA9 /* IOKit.framework */; };
 		E3003C7F0C88505D0072F2A8 /* DeleteHighlightPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = E3003C7E0C88505D0072F2A8 /* DeleteHighlightPressed.png */; };
@@ -156,11 +160,11 @@
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		4D1FD381073D19CE00E46515 /* HBPreviewController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBPreviewController.h; sourceTree = "<group>"; };
-		4D1FD382073D19CE00E46515 /* HBPreviewController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = HBPreviewController.mm; sourceTree = "<group>"; };
+		4D1FD382073D19CE00E46515 /* HBPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBPreviewController.m; sourceTree = "<group>"; };
 		4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
 		4DEB2024052B055F00C39CA9 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
 		4DF3C8CB052889CD00A80101 /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; };
-		4DF3C8CC052889CD00A80101 /* Controller.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = Controller.mm; sourceTree = "<group>"; };
+		4DF3C8CC052889CD00A80101 /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; };
 		526FBC760B4CA8F40064E04C /* test.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; name = test.c; path = ../test/test.c; sourceTree = SOURCE_ROOT; };
 		593034E90BBA39A100172349 /* ChapterTitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChapterTitles.h; sourceTree = "<group>"; };
 		593034EA0BBA39A100172349 /* ChapterTitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChapterTitles.m; sourceTree = "<group>"; };
@@ -179,7 +183,7 @@
 		A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBDVDDetector.h; sourceTree = "<group>"; };
 		A2A1EC390C76C58400827E0D /* HBDVDDetector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBDVDDetector.m; sourceTree = "<group>"; };
 		A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = "<group>"; };
-		A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureController.mm; sourceTree = "<group>"; };
+		A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PictureController.m; sourceTree = "<group>"; };
 		A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
 		A2D18AA50FD81C50003C997B /* HBSubtitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSubtitles.h; sourceTree = "<group>"; };
 		A2D18AA60FD81C50003C997B /* HBSubtitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSubtitles.m; sourceTree = "<group>"; };
@@ -193,6 +197,10 @@
 		A906A0500F7A7B210007A827 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = /System/Library/Frameworks/AudioToolbox.framework; sourceTree = "<absolute>"; };
 		A9AC41DD0C918DB500DDF9B8 /* HBAdvancedController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBAdvancedController.m; sourceTree = "<group>"; };
 		A9AC41DE0C918DB500DDF9B8 /* HBAdvancedController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBAdvancedController.h; sourceTree = "<group>"; };
+		D234BCB91240E82800BE2E98 /* HBAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudio.h; sourceTree = "<group>"; };
+		D234BCBA1240E82800BE2E98 /* HBAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudio.m; sourceTree = "<group>"; };
+		D234BCBB1240E82800BE2E98 /* HBAudioController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudioController.h; sourceTree = "<group>"; };
+		D234BCBC1240E82800BE2E98 /* HBAudioController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioController.m; sourceTree = "<group>"; };
 		D289A9F20DBBE7AC00CE614B /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
 		E3003C7E0C88505D0072F2A8 /* DeleteHighlightPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeleteHighlightPressed.png; sourceTree = "<group>"; };
 		E3003CB40C8852B70072F2A8 /* DeletePressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeletePressed.png; sourceTree = "<group>"; };
@@ -341,16 +349,20 @@
 		526FBC930B4CAA260064E04C /* HandBrake Sources */ = {
 			isa = PBXGroup;
 			children = (
+				D234BCB91240E82800BE2E98 /* HBAudio.h */,
+				D234BCBA1240E82800BE2E98 /* HBAudio.m */,
+				D234BCBB1240E82800BE2E98 /* HBAudioController.h */,
+				D234BCBC1240E82800BE2E98 /* HBAudioController.m */,
 				A2D18AA50FD81C50003C997B /* HBSubtitles.h */,
 				A2D18AA60FD81C50003C997B /* HBSubtitles.m */,
-				4DF3C8CC052889CD00A80101 /* Controller.mm */,
+				4DF3C8CB052889CD00A80101 /* Controller.h */,
+				4DF3C8CC052889CD00A80101 /* Controller.m */,
 				A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */,
-				A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */,
+				A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */,
 				A22C85EA0D05D35000C10E36 /* HBPresets.h */,
 				A22C85EB0D05D35000C10E36 /* HBPresets.m */,
-				4D1FD382073D19CE00E46515 /* HBPreviewController.mm */,
 				4D1FD381073D19CE00E46515 /* HBPreviewController.h */,
-				4DF3C8CB052889CD00A80101 /* Controller.h */,
+				4D1FD382073D19CE00E46515 /* HBPreviewController.m */,
 				593034E90BBA39A100172349 /* ChapterTitles.h */,
 				593034EA0BBA39A100172349 /* ChapterTitles.m */,
 				A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */,
@@ -431,6 +443,8 @@
 				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;
 		};
@@ -610,8 +624,8 @@
 			files = (
 				59CBD2650BBB4D1B004A3BE3 /* ChapterTitles.m in Sources */,
 				4DD93F9A082036E8008E1322 /* main.mm in Sources */,
-				4DD93F9B082036E8008E1322 /* Controller.mm in Sources */,
-				4DD93F9E082036E8008E1322 /* HBPreviewController.mm in Sources */,
+				4DD93F9B082036E8008E1322 /* Controller.m in Sources */,
+				4DD93F9E082036E8008E1322 /* HBPreviewController.m in Sources */,
 				A2A1EC3A0C76C58400827E0D /* HBDVDDetector.m in Sources */,
 				253886020BFE0A5B0064E995 /* HBOutputRedirect.m in Sources */,
 				253886180BFE0C160064E995 /* HBOutputPanelController.m in Sources */,
@@ -620,8 +634,10 @@
 				A9AC41DF0C918DB500DDF9B8 /* HBAdvancedController.m in Sources */,
 				E37172670C977D340072B384 /* HBImageAndTextCell.m in Sources */,
 				A22C85ED0D05D35100C10E36 /* HBPresets.m in Sources */,
-				A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.mm in Sources */,
+				A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.m in Sources */,
 				A2D18AA80FD81C50003C997B /* HBSubtitles.m in Sources */,
+				D234BCBE1240E82800BE2E98 /* HBAudio.m in Sources */,
+				D234BCC01240E82800BE2E98 /* HBAudioController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -711,12 +727,15 @@
 		0DFF0C0D0B6BCEE000549488 /* debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				INSTALL_PATH = /usr/local/bin;
 				OTHER_LDFLAGS = (
+					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -741,12 +760,15 @@
 		0DFF0C0E0B6BCEE000549488 /* standard */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				INSTALL_PATH = /usr/local/bin;
 				OTHER_LDFLAGS = (
+					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -779,6 +801,7 @@
 				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;
@@ -808,10 +831,12 @@
 				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/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -842,12 +867,15 @@
 		27B4DEB40F65BAB600098046 /* standard.i386 */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				INSTALL_PATH = /usr/local/bin;
 				OTHER_LDFLAGS = (
+					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -901,6 +929,7 @@
 				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;
@@ -930,10 +959,12 @@
 				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/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -964,12 +995,15 @@
 		27B4DEBA0F65BAB700098046 /* standard.x86_64 */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				INSTALL_PATH = /usr/local/bin;
 				OTHER_LDFLAGS = (
+					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1023,6 +1057,7 @@
 				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;
@@ -1052,10 +1087,12 @@
 				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/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1086,12 +1123,15 @@
 		27B4DEC00F65BAB800098046 /* standard.ppc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				INSTALL_PATH = /usr/local/bin;
 				OTHER_LDFLAGS = (
+					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1145,6 +1185,7 @@
 				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;
@@ -1174,10 +1215,12 @@
 				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/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1208,12 +1251,15 @@
 		27B4DEC60F65BAB900098046 /* standard.ppc64 */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				INSTALL_PATH = /usr/local/bin;
 				OTHER_LDFLAGS = (
+					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1269,6 +1315,7 @@
 				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;
@@ -1299,10 +1346,12 @@
 				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/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1333,12 +1382,15 @@
 		27B4DECC0F65BABC00098046 /* debug.i386 */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				INSTALL_PATH = /usr/local/bin;
 				OTHER_LDFLAGS = (
+					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1394,6 +1446,7 @@
 				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;
@@ -1424,10 +1477,12 @@
 				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/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1458,12 +1513,15 @@
 		27B4DED20F65BABD00098046 /* debug.x86_64 */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				INSTALL_PATH = /usr/local/bin;
 				OTHER_LDFLAGS = (
+					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1519,6 +1577,7 @@
 				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;
@@ -1549,10 +1608,12 @@
 				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/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1583,12 +1644,15 @@
 		27B4DED80F65BABD00098046 /* debug.ppc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				INSTALL_PATH = /usr/local/bin;
 				OTHER_LDFLAGS = (
+					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1644,6 +1708,7 @@
 				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;
@@ -1674,10 +1739,12 @@
 				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/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1708,12 +1775,15 @@
 		27B4DEDE0F65BABD00098046 /* debug.ppc64 */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				INSTALL_PATH = /usr/local/bin;
 				OTHER_LDFLAGS = (
+					"$(EXTERNAL_BUILD)/contrib/lib/libbluray.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/liba52.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1808,10 +1878,12 @@
 				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/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1849,10 +1921,12 @@
 				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/libavcodec.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavformat.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libavutil.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libavcore.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdca.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdnav.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libdvdread.a",
@@ -1892,6 +1966,7 @@
 				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;
@@ -1922,6 +1997,7 @@
 				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;