summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2012-04-26 19:02:38 +0000
committerjstebbins <[email protected]>2012-04-26 19:02:38 +0000
commit3f9828657ded40e2eabfef8f01fa2182a4eccd36 (patch)
treec7dfd72487792783c4559b803bfee392f974d140 /gtk
parent50745fe1c6d5d54055bc82f8e3052cee857f853d (diff)
LinGui: allow the user to select and use a bitrate for audio autopassthru
If the fallback encoder is used, the user should be able to set the bitrate that is used. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4604 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
-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 52c5f8599..d0e3f8d88 100644
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -56,7 +56,7 @@ check_list_full(signal_user_data_t *ud)
gint
ghb_select_audio_codec(gint mux, hb_audio_config_t *aconfig, gint acodec, gint fallback, gint copy_mask)
{
- guint32 in_codec = aconfig ? aconfig->in.codec : HB_ACODEC_MASK;
+ guint32 in_codec = aconfig ? aconfig->in.codec : 0;
if (acodec == HB_ACODEC_AUTO_PASS)
{
return hb_autopassthru_get_encoder(in_codec, copy_mask, fallback, mux);
@@ -438,17 +438,6 @@ ghb_set_pref_audio_settings(gint titleindex, GValue *settings)
// Skip this audio
acodec = 0;
}
- else
- {
- int channels;
- select_acodec = fallback;
- mix = ghb_get_best_mix(aconfig, select_acodec, mix);
- channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(mix);
- bitrate = aconfig->in.bitrate / 1000;
- bitrate = hb_get_best_audio_bitrate(select_acodec, bitrate,
- aconfig->in.samplerate, mix);
- rate = 0;
- }
}
else
{