Move mixdown-> channel_layout/matrix_encoding translation to hb_audio_resample_init().

Unlike hb_audio_remap, hb_audio_resample will never be used in situations where we don't have a mixdown.



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

1 files changed, 4 insertions, 4 deletions

diff --git a/libhb/declpcm.c b/libhb/declpcm.c
index 85a47c313..0cb5726a5 100644
--- a/libhb/declpcm.c
+++ b/libhb/declpcm.c
@@ -162,10 +162,10 @@ static int declpcmInit( hb_work_object_t * w, hb_job_t * job )
     w->private_data = pv;
     pv->job = job;
 
-    int mode;
-    uint64_t layout = hb_ff_mixdown_xlat(w->audio->config.out.mixdown, &mode);
-    pv->resample = hb_audio_resample_init(AV_SAMPLE_FMT_FLT, layout, mode,
-                                          w->audio->config.out.normalize_mix_level);
+    pv->resample =
+        hb_audio_resample_init(AV_SAMPLE_FMT_FLT,
+                               w->audio->config.out.mixdown, 1,
+                               w->audio->config.out.normalize_mix_level);
     if (pv->resample == NULL)
     {
         hb_error("declpcmInit: hb_audio_resample_init() failed");