From fca242d2876319d11bce48304e0dc18eefdeb65a Mon Sep 17 00:00:00 2001 From: jstebbins Date: Sat, 9 Oct 2010 16:54:52 +0000 Subject: print more accurate log message when mixdown is not set git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3588 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/work.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'libhb') diff --git a/libhb/work.c b/libhb/work.c index 7fdcab867..7caa0691e 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -571,14 +571,6 @@ static void do_job( hb_job_t * job, int cpu_count ) /* sense-check the current mixdown options */ - /* log the requested mixdown */ - for (j = 0; j < hb_audio_mixdowns_count; j++) { - if (hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown) { - requested_mixdown = audio->config.out.mixdown; - requested_mixdown_index = j; - } - } - /* sense-check the requested mixdown */ if( audio->config.out.mixdown == 0 && audio->config.out.codec != HB_ACODEC_AC3_PASS && @@ -589,6 +581,23 @@ static void do_job( hb_job_t * job, int cpu_count ) * set a default mixdown */ audio->config.out.mixdown = best_mixdown; + for (j = 0; j < hb_audio_mixdowns_count; j++) + { + if (hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown) + { + hb_log("work: mixdown not specified, track %i setting mixdown %s", i, hb_audio_mixdowns[j].human_readable_name); + break; + } + } + } + + /* log the requested mixdown */ + for (j = 0; j < hb_audio_mixdowns_count; j++) { + if (hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown) { + requested_mixdown = audio->config.out.mixdown; + requested_mixdown_index = j; + break; + } } if ( !( audio->config.out.codec & HB_ACODEC_PASS_FLAG ) ) -- cgit v1.2.3