From 93909da3e85cb0b9078d7d9a254d3e50fcb0f05b Mon Sep 17 00:00:00 2001 From: jstebbins Date: Sat, 5 May 2012 18:13:43 +0000 Subject: [PATCH] LinGui: merge fix for "allowed passthru" options to bugfix branch git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.9.x@4641 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- gtk/src/audiohandler.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c index 533729e02..29f4ebbc4 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 ) -- 2.40.0