diff options
| author | Rodeo <[email protected]> | 2012-06-20 15:26:32 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-06-20 15:26:32 +0000 |
| commit | 9e3a42cb43f64368c1d804fd5d9a6f61c2305a42 (patch) | |
| tree | fa2dbf307afb2516f60c2ad56429dc7bc39c34cf | |
| parent | e4460af63dd76181f489da5f6281a3716c2bf58f (diff) | |
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
| -rw-r--r-- | libhb/common.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libhb/common.c b/libhb/common.c index 6d4d5ee5e..aba940619 100644 --- 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) |