diff options
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/ExpressController.m | 9 | ||||
| -rw-r--r-- | macosx/HandBrake.xcodeproj/project.pbxproj | 114 |
2 files changed, 5 insertions, 118 deletions
diff --git a/macosx/ExpressController.m b/macosx/ExpressController.m index 9191bb7e6..6579d6429 100644 --- a/macosx/ExpressController.m +++ b/macosx/ExpressController.m @@ -205,11 +205,12 @@ if( [fConvertFormatPopUp indexOfSelectedItem] == 0 ) { /* iPod / H.264 */ - job->mux = HB_MUX_MP4; + job->mux = HB_MUX_IPOD; job->vcodec = HB_VCODEC_X264; - job->h264_13 = 1; - job->vbitrate = 600; - pixels = 76800; + job->h264_level = 30; + job->vbitrate = 1000; + job->deinterlace = 1; + pixels = 307200; aspect = 4 * HB_ASPECT_BASE / 3; } else if( [fConvertFormatPopUp indexOfSelectedItem] == 1 ) diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 3dcd1e222..3921362cc 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -40,34 +40,6 @@ 4DE09E63082038A400FB751F /* HandBrake.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4DE09E62082038A400FB751F /* HandBrake.plist */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - 4A9504CCFFE6A4B311CA0CBA /* Development */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.7.1; - GCC_DYNAMIC_NO_PIC = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_TREAT_WARNINGS_AS_ERRORS = NO; - LIBRARY_SEARCH_PATHS = ""; - ZERO_LINK = NO; - }; - name = Development; - }; - 4A9504CDFFE6A4B311CA0CBA /* Deployment */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_TREAT_WARNINGS_AS_ERRORS = NO; - ZERO_LINK = NO; - }; - name = Deployment; - }; -/* End PBXBuildStyle section */ - /* Begin PBXFileReference section */ 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; @@ -239,54 +211,11 @@ ); buildRules = ( ); - buildSettings = { - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - INFOPLIST_FILE = "Instant HandBrake.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PREBINDING = NO; - PRODUCT_NAME = "Instant HandBrake"; - WRAPPER_EXTENSION = app; - ZERO_LINK = YES; - }; dependencies = ( ); name = "Instant HandBrake"; productName = "Instant HandBrake"; productReference = 4D1EA2DA0993B01000FDC1A2 /* Instant HandBrake.app */; - productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> -<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\"> -<plist version=\"1.0\"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleExecutable</key> - <string>${EXECUTABLE_NAME}</string> - <key>CFBundleIdentifier</key> - <string>com.yourcompany.Instant HandBrake</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleVersion</key> - <string>1.0</string> - <key>NSMainNibFile</key> - <string>MainMenu</string> - <key>NSPrincipalClass</key> - <string>NSApplication</string> -</dict> -</plist> -"; productType = "com.apple.product-type.application"; }; 4DD93F8D082036E8008E1322 /* HandBrake */ = { @@ -300,41 +229,6 @@ ); buildRules = ( ); - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_TREAT_WARNINGS_AS_ERRORS = NO; - HEADER_SEARCH_PATHS = ../libhb; - INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = ""; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - ../libhb/libhb.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, - ); - PRODUCT_NAME = HandBrake; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - WRAPPER_EXTENSION = app; - }; dependencies = ( ); name = HandBrake; @@ -348,14 +242,6 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = 4D4E7BC4087804870051572B /* Build configuration list for PBXProject "HandBrake" */; - buildSettings = { - MACOSX_DEPLOYMENT_TARGET = 10.3; - SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk; - }; - buildStyles = ( - 4A9504CCFFE6A4B311CA0CBA /* Development */, - 4A9504CDFFE6A4B311CA0CBA /* Deployment */, - ); hasScannedForEncodings = 1; mainGroup = 29B97314FDCFA39411CA2CEA /* HandBrake */; projectDirPath = ""; |