1 | *** ./libs/libmyth/audiooutputbase.cpp.orig Sat Jul 10 17:48:06 2010 |
---|
2 | --- ./libs/libmyth/audiooutputbase.cpp Wed Aug 11 09:59:04 2010 |
---|
3 | *************** |
---|
4 | *** 412,418 **** |
---|
5 | // Force resampling if we are encoding to AC3 and sr > 48k |
---|
6 | // or if 48k override was checked in settings |
---|
7 | if ((gCoreContext->GetNumSetting("AdvancedAudioSettings", false) && |
---|
8 | ! gCoreContext->GetNumSetting("Audio48kOverride", false)) || |
---|
9 | (enc && (samplerate > 48000 || (need_resampler && dest_rate > 48000)))) |
---|
10 | { |
---|
11 | VBAUDIO("Forcing resample to 48 kHz"); |
---|
12 | --- 412,419 ---- |
---|
13 | // Force resampling if we are encoding to AC3 and sr > 48k |
---|
14 | // or if 48k override was checked in settings |
---|
15 | if ((gCoreContext->GetNumSetting("AdvancedAudioSettings", false) && |
---|
16 | ! gCoreContext->GetNumSetting("Audio48kOverride", false) && |
---|
17 | ! (samplerate != 48000)) || |
---|
18 | (enc && (samplerate > 48000 || (need_resampler && dest_rate > 48000)))) |
---|
19 | { |
---|
20 | VBAUDIO("Forcing resample to 48 kHz"); |
---|