summaryrefslogtreecommitdiffstats
path: root/gtk/src
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2012-05-05 18:12:00 +0000
committerjstebbins <[email protected]>2012-05-05 18:12:00 +0000
commit1c8309d77ea303954f8c9e3919c595de54f173f2 (patch)
tree761ac8ed4ae3bd6a36d1e8c0055df9df843d233f /gtk/src
parent7d843e635db3fc6af55b89fb298b4e4ef446a2e5 (diff)
LinGui: use "allowed passthru" options even when hidden by preference option
If you don't do this, then presets that use these will not function as advertised. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4640 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src')
-rw-r--r--gtk/src/audiohandler.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
index 7efbfb74f..6e080dd9a 100644
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -96,15 +96,6 @@ int ghb_get_copy_mask(GValue *settings)
{
gint mask = 0;
- if (!ghb_settings_get_boolean(settings, "AdvancedAutoPassthru"))
- {
- mask = HB_ACODEC_MP3 |
- HB_ACODEC_FFAAC |
- HB_ACODEC_AC3 |
- HB_ACODEC_DCA |
- HB_ACODEC_DCA_HD;
- return mask;
- }
if (ghb_settings_get_boolean(settings, "AudioAllowMP3Pass"))
{
mask |= HB_ACODEC_MP3;
@@ -146,9 +137,7 @@ static int ghb_select_fallback( GValue *settings, int mux, int acodec )
default:
{
- if (ghb_settings_get_boolean(settings, "AdvancedAutoPassthru"))
- fallback = ghb_settings_combo_int(settings,
- "AudioEncoderFallback");
+ fallback = ghb_settings_combo_int(settings, "AudioEncoderFallback");
}
}
if ( mux == HB_MUX_MP4 )