summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2013-01-06 05:09:54 +0000
committerjstebbins <[email protected]>2013-01-06 05:09:54 +0000
commit576e69efbdb7271292af5b37f9927bcc15e537a6 (patch)
tree9630015bcd2959e7e669d7c0a10268f52f32eaf3 /gtk
parent8bc6f81283d4741728035972d6f1d75557a689ba (diff)
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
Diffstat (limited to 'gtk')
-rw-r--r--gtk/src/audiohandler.c24
1 files changed, 1 insertions, 23 deletions
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