Use HB_INVALID_AMIXDOWN and HB_AMIXDOWN_NONE where applicable.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4879 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 5 insertions, 4 deletions

diff --git a/libhb/work.c b/libhb/work.c
index ae7538dfd..6e49687da 100644
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -817,7 +817,7 @@ static void do_job( hb_job_t * job )
         audio = hb_list_item( title->list_audio, i );
 
         /* sense-check the requested mixdown */
-        if( audio->config.out.mixdown <= 0 &&
+        if( audio->config.out.mixdown <= HB_AMIXDOWN_NONE &&
             !( audio->config.out.codec & HB_ACODEC_PASS_FLAG ) )
         {
             /*
@@ -845,10 +845,11 @@ static void do_job( hb_job_t * job )
             }
         }
 
-        best_mixdown = hb_get_best_mixdown( audio->config.out.codec,
-                                            audio->config.in.channel_layout, 0 );
+        best_mixdown = hb_get_best_mixdown(audio->config.out.codec,
+                                           audio->config.in.channel_layout,
+                                           audio->config.out.mixdown);
 
-        if ( audio->config.out.mixdown > best_mixdown )
+        if (audio->config.out.mixdown != best_mixdown)
         {
             audio->config.out.mixdown = best_mixdown;
         }