From 576e69efbdb7271292af5b37f9927bcc15e537a6 Mon Sep 17 00:00:00 2001
From: jstebbins <jstebbins.hb@gmail.com>
Date: Sun, 6 Jan 2013 05:09:54 +0000
Subject: LinGui: fix issue with FLAC24 fallback

Was setting lame as fallback when flac24 fallback was set.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5154 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 gtk/src/audiohandler.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

(limited to 'gtk/src')

diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
index 5f07abf70..8c4707266 100644
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -122,7 +122,6 @@ int ghb_get_copy_mask(GValue *settings)
 
 int ghb_select_fallback( GValue *settings, int mux, int acodec )
 {
-    gint mask;
     gint fallback = 0;
 
     switch ( acodec )
@@ -139,30 +138,9 @@ int ghb_select_fallback( GValue *settings, int mux, int acodec )
         default:
         {
             fallback = ghb_settings_combo_int(settings, "AudioEncoderFallback");
+            return hb_autopassthru_get_encoder(acodec, 0, fallback, mux);
         }
     }
-    if ( mux == HB_MUX_MP4 )
-    {
-        mask =  HB_ACODEC_LAME |
-                HB_ACODEC_FFAAC |
-                HB_ACODEC_FAAC |
-                HB_ACODEC_AC3;
-    }
-    if ( mux == HB_MUX_MKV )
-    {
-        mask =  
-                HB_ACODEC_FAAC |
-                HB_ACODEC_LAME |
-                HB_ACODEC_VORBIS |
-                HB_ACODEC_AC3 |
-                HB_ACODEC_FFAAC |
-                HB_ACODEC_FFFLAC;
-    }
-    if (!(fallback & mask ))
-    {
-        fallback = HB_ACODEC_LAME;
-    }
-    return fallback;
 }
 
 void
-- 
cgit v1.2.3