hb_get_best_mixdown: fix bug introduced in revision 4755.

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

diff --git a/libhb/common.c b/libhb/common.c
index 6d4d5ee5e79737adc22af0ef71f1f0297106321a..aba9406192f9d6fe682b94ed00b5da63b2e827d7 100644 (file)
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -724,7 +724,14 @@ int hb_get_best_mixdown(uint32_t codec, int layout, int mixdown)
     {
         // full 3F2R, possibly with additional channels, and an LFE
         // limiting factor: liba52, libdca (can't upmix)
-        best_mixdown = HB_AMIXDOWN_6CH;
+        if (codec == HB_ACODEC_LAME || codec == HB_ACODEC_FFAAC)
+        {
+            best_mixdown = HB_AMIXDOWN_DOLBYPLII;
+        }
+        else
+        {
+            best_mixdown = HB_AMIXDOWN_6CH;
+        }
     }
     else if ((layout & AV_CH_LAYOUT_5POINT0) == AV_CH_LAYOUT_5POINT0 ||
              (layout & AV_CH_LAYOUT_5POINT0_BACK) == AV_CH_LAYOUT_5POINT0_BACK)