diff options
| author | Rodeo <[email protected]> | 2012-06-20 15:59:03 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-06-20 15:59:03 +0000 |
| commit | 28ff9e210e2604c47c5f157043aa85d4d56b6a16 (patch) | |
| tree | 40c56e52a934f567e38a4ee15fbf6bcdb9fae070 /macosx/HBAudio.m | |
| parent | d2189f51f3d68ac81e4849bda4a96877981baeab (diff) | |
Remove encca_haac_available(). It's no longer needed since we dropped support for OS X 10.5.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4759 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/HBAudio.m')
| -rw-r--r-- | macosx/HBAudio.m | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/macosx/HBAudio.m b/macosx/HBAudio.m index 51743dcfa..b170e4a50 100644 --- a/macosx/HBAudio.m +++ b/macosx/HBAudio.m @@ -70,28 +70,26 @@ static NSMutableArray *masterBitRateArray = nil; { if ([HBAudio class] == self) { - int i, audioMustMatch, shouldAdd; + int i, audioMustMatch; BOOL muxMKV, muxMP4; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSDictionary *dict; masterCodecArray = [[NSMutableArray alloc] init]; // knowingly leaked - for( i = 0; i < hb_audio_encoders_count; i++ ) + for (i = 0; i < hb_audio_encoders_count; i++) { - if( ( hb_audio_encoders[i].encoder & HB_ACODEC_PASS_FLAG ) && - ( hb_audio_encoders[i].encoder != HB_ACODEC_AUTO_PASS ) ) + if ((hb_audio_encoders[i].encoder & HB_ACODEC_PASS_FLAG) && + (hb_audio_encoders[i].encoder != HB_ACODEC_AUTO_PASS)) { - audioMustMatch = ( hb_audio_encoders[i].encoder & ~HB_ACODEC_PASS_FLAG ); + audioMustMatch = (hb_audio_encoders[i].encoder & ~HB_ACODEC_PASS_FLAG); } else { audioMustMatch = 0; } - // don't add HE-AAC encoder if it's unavailable - shouldAdd = ( hb_audio_encoders[i].encoder != HB_ACODEC_CA_HAAC ) || encca_haac_available(); - muxMKV = ( hb_audio_encoders[i].muxers & HB_MUX_MKV ) ? YES : NO; - muxMP4 = ( hb_audio_encoders[i].muxers & HB_MUX_MP4 ) ? YES : NO; - if( shouldAdd && audioMustMatch ) + muxMKV = (hb_audio_encoders[i].muxers & HB_MUX_MKV) ? YES : NO; + muxMP4 = (hb_audio_encoders[i].muxers & HB_MUX_MP4) ? YES : NO; + if (audioMustMatch) { [masterCodecArray addObject: [NSDictionary dictionaryWithObjectsAndKeys: [NSString stringWithUTF8String: hb_audio_encoders[i].human_readable_name], keyAudioCodecName, @@ -101,7 +99,7 @@ static NSMutableArray *masterBitRateArray = nil; [NSNumber numberWithInt: audioMustMatch], keyAudioMustMatchTrack, nil]]; } - else if( shouldAdd ) + else { [masterCodecArray addObject: [NSDictionary dictionaryWithObjectsAndKeys: [NSString stringWithUTF8String: hb_audio_encoders[i].human_readable_name], keyAudioCodecName, |