diff options
| -rw-r--r-- | gtk/src/audiohandler.c | 13 | ||||
| -rw-r--r-- | libhb/common.c | 5 |
2 files changed, 5 insertions, 13 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 { diff --git a/libhb/common.c b/libhb/common.c index 2cab52034..3f3097485 100644 --- a/libhb/common.c +++ b/libhb/common.c @@ -334,7 +334,10 @@ void hb_get_audio_bitrate_limits(uint32_t codec, int samplerate, int mixdown, in if( codec & HB_ACODEC_PASS_FLAG ) { // Bitrates don't apply to "lossless" audio (Passthru, FLAC) - *low = *high = -1; + // ... but may be applied if we fallback to an encoder + // when the source can not be passed. + *high = 768; + *low = 32; return; } switch( codec ) |