diff options
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/HBAudio.m | 2 | ||||
| -rw-r--r-- | macosx/HBAudioController.m | 2 | ||||
| -rw-r--r-- | macosx/HandBrake.xcodeproj/project.pbxproj | 20 |
3 files changed, 18 insertions, 6 deletions
diff --git a/macosx/HBAudio.m b/macosx/HBAudio.m index 3b5f2d4cf..51743dcfa 100644 --- a/macosx/HBAudio.m +++ b/macosx/HBAudio.m @@ -229,9 +229,9 @@ static NSMutableArray *masterBitRateArray = nil; BOOL shouldAdd; int currentMixdown; + unsigned long long channelLayout = [[track objectForKey: keyAudioInputChannelLayout] unsignedLongLongValue]; unsigned int count = [masterMixdownArray count]; int codecCodec = [[codec objectForKey: keyAudioCodec] intValue]; - int channelLayout = [[track objectForKey: keyAudioInputChannelLayout] intValue]; int theDefaultMixdown = hb_get_default_mixdown(codecCodec, channelLayout); int theBestMixdown = hb_get_best_mixdown(codecCodec, channelLayout, 0); diff --git a/macosx/HBAudioController.m b/macosx/HBAudioController.m index fe4b6072e..2c60b0fca 100644 --- a/macosx/HBAudioController.m +++ b/macosx/HBAudioController.m @@ -598,7 +598,7 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification"; [NSNumber numberWithInt: audio->in.bitrate / 1000], keyAudioInputBitrate, [NSNumber numberWithInt: audio->in.samplerate], keyAudioInputSampleRate, [NSNumber numberWithInt: audio->in.codec], keyAudioInputCodec, - [NSNumber numberWithInt: audio->in.channel_layout], keyAudioInputChannelLayout, + [NSNumber numberWithUnsignedLongLong: audio->in.channel_layout], keyAudioInputChannelLayout, nil]]; } self.masterTrackArray = newTrackArray; diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 3f8c59561..073b9448b 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -961,7 +961,10 @@ 273F200814ADAE950021BE6D /* debug */ = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb"; + HEADER_SEARCH_PATHS = ( + "\"$(EXTERNAL_BUILD)/libhb\"", + "\"$(EXTERNAL_BUILD)/contrib/include\"", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(EXTERNAL_BUILD)/libhb\"", @@ -974,7 +977,10 @@ 273F200914ADAE950021BE6D /* release */ = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb"; + HEADER_SEARCH_PATHS = ( + "\"$(EXTERNAL_BUILD)/libhb\"", + "\"$(EXTERNAL_BUILD)/contrib/include\"", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(EXTERNAL_BUILD)/libhb\"", @@ -991,7 +997,10 @@ "$(inherited)", "\"$(SRCROOT)\"", ); - HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb"; + HEADER_SEARCH_PATHS = ( + "\"$(EXTERNAL_BUILD)/libhb\"", + "\"$(EXTERNAL_BUILD)/contrib/include\"", + ); INFOPLIST_FILE = "$(EXTERNAL_BUILD)/macosx/Info.plist"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -1010,7 +1019,10 @@ "$(inherited)", "\"$(SRCROOT)\"", ); - HEADER_SEARCH_PATHS = "$(EXTERNAL_BUILD)/libhb"; + HEADER_SEARCH_PATHS = ( + "\"$(EXTERNAL_BUILD)/libhb\"", + "\"$(EXTERNAL_BUILD)/contrib/include\"", + ); INFOPLIST_FILE = "$(EXTERNAL_BUILD)/macosx/Info.plist"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", |