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

diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
index 533729e020fda84b4abcd043662ad19fff0a4883..29f4ebbc483d84524772839225f7bef1d90a0552 100644 (file)
--- 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 )