diff options
| author | jstebbins <[email protected]> | 2014-08-18 17:22:30 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2014-08-18 17:22:30 +0000 |
| commit | c548eb0cb8c86031541afaad848023fc8f4ff55a (patch) | |
| tree | 95a2293b59a8289fa179fb19f52699aee024aae1 /macosx | |
| parent | 748126d08ba751d866f2d0140d04d4d08346cdf3 (diff) | |
build: remove mp4v2 and libmkv dependencies
...and enable x265 by default
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6309 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/Controller.m | 2 | ||||
| -rw-r--r-- | macosx/HandBrake.xcodeproj/project.pbxproj | 4 | ||||
| -rw-r--r-- | macosx/xcconfig/supplemental.xcconfig | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m index e1a45d206..efbf6e863 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -4507,8 +4507,6 @@ fWorkingCount = 0; [fDstMp4iPodFileCheck setHidden:YES]; switch (videoContainer) { - case HB_MUX_MP4V2: - [fDstMp4LargeFileCheck setHidden:NO]; case HB_MUX_AV_MP4: [fDstMp4HttpOptFileCheck setHidden:NO]; [fDstMp4iPodFileCheck setHidden:NO]; diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index c2e14bebb..c92c026eb 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -298,8 +298,6 @@ 277EFE8917ED4F5D001D4A6A /* osx108.i386.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = osx108.i386.xcconfig; sourceTree = "<group>"; }; 277EFE8B17ED4F63001D4A6A /* osx108.x86_64.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = osx108.x86_64.xcconfig; sourceTree = "<group>"; }; 277EFE8D17ED5628001D4A6A /* supplemental.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = supplemental.xcconfig; sourceTree = "<group>"; }; - 277EFE8F17ED7296001D4A6A /* libmp4v2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmp4v2.a; path = external/contrib/lib/libmp4v2.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 277EFE9017ED72A1001D4A6A /* libmkv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmkv.a; path = external/contrib/lib/libmkv.a; sourceTree = BUILT_PRODUCTS_DIR; }; 277EFE9217ED799E001D4A6A /* libfdk-aac.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libfdk-aac.a"; path = "external/contrib/lib/libfdk-aac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 27D6C72414B1019100B785E4 /* libhandbrake.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhandbrake.a; path = external/libhb/libhandbrake.a; sourceTree = BUILT_PRODUCTS_DIR; }; 27D6C72814B102DA00B785E4 /* libass.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libass.a; path = external/contrib/lib/libass.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -729,8 +727,6 @@ isa = PBXGroup; children = ( 277EFE9217ED799E001D4A6A /* libfdk-aac.a */, - 277EFE9017ED72A1001D4A6A /* libmkv.a */, - 277EFE8F17ED7296001D4A6A /* libmp4v2.a */, 22CC9E74191EBEA500C69D81 /* libx265.a */, ); name = "Static Libraries (optional)"; diff --git a/macosx/xcconfig/supplemental.xcconfig b/macosx/xcconfig/supplemental.xcconfig index a92536f8d..5f72bce04 100644 --- a/macosx/xcconfig/supplemental.xcconfig +++ b/macosx/xcconfig/supplemental.xcconfig @@ -1,4 +1,4 @@ // ## THIS FILE IS INTENDED FOR LOCAL WORKSPACE ONLY. // ## THIS FILE SHOULD NEVER BE COMMITTED TO REPOSITORY WITH UNCOMMENTED LINES. -// EXTERNAL_CONFIGURE = --disable-mp4v2 --disable-mkv +// EXTERNAL_CONFIGURE = |