diff options
| author | jstebbins <[email protected]> | 2009-04-29 00:53:33 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-04-29 00:53:33 +0000 |
| commit | bdea38695081316c3bddc8c778d4b6345b09cd77 (patch) | |
| tree | d32646c03a572c7a1e2fa5f6304a000fc8588eb2 /gtk/src/hb-backend.c | |
| parent | 062bdda5677651a1e844dadb2eb3fb9761e40541 (diff) | |
LinGui: fix stupid mistake in setting the audio codec
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2359 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src/hb-backend.c')
| -rw-r--r-- | gtk/src/hb-backend.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index e60e04954..05d0e5427 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -3617,23 +3617,25 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex) audio.out.codec = ghb_settings_combo_int(asettings, "AudioEncoder"); taudio = (hb_audio_config_t *) hb_list_audio_config_item( title->list_audio, audio.in.track ); - if (!(taudio->in.codec & audio.out.codec) && - (audio.out.codec & (HB_ACODEC_AC3 | HB_ACODEC_DCA))) + if (audio.out.codec & (HB_ACODEC_AC3 | HB_ACODEC_DCA)) { - // Not supported. AC3 is passthrough only, so input must be AC3 - if (job->mux == HB_MUX_AVI) + if (!(taudio->in.codec & audio.out.codec)) { - audio.out.codec = HB_ACODEC_LAME; + // Not supported. AC3 is passthrough only, so input must be AC3 + if (job->mux == HB_MUX_AVI) + { + audio.out.codec = HB_ACODEC_LAME; + } + else + { + audio.out.codec = HB_ACODEC_FAAC; + } } else { - audio.out.codec = HB_ACODEC_FAAC; + audio.out.codec &= taudio->in.codec; } } - else - { - audio.out.codec &= taudio->in.codec; - } if ((job->mux == HB_MUX_MP4) && ((audio.out.codec == HB_ACODEC_LAME) || (audio.out.codec == HB_ACODEC_VORBIS))) |