summaryrefslogtreecommitdiffstats
path: root/libhb/encavcodecaudio.c
diff options
context:
space:
mode:
authorRodeo <[email protected]>2012-08-27 22:00:28 +0000
committerRodeo <[email protected]>2012-08-27 22:00:28 +0000
commit33aaba22f0a5a8290ba75809b522e4293822296b (patch)
treebd3cb639b1612aa8ee4dcf47db1db5f7d981935d /libhb/encavcodecaudio.c
parentd5cd2171f6bd69ec44d4568926728b890f7d1f97 (diff)
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
Diffstat (limited to 'libhb/encavcodecaudio.c')
-rw-r--r--libhb/encavcodecaudio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c
index 3a0af64d2..67f4d23d5 100644
--- a/libhb/encavcodecaudio.c
+++ b/libhb/encavcodecaudio.c
@@ -118,8 +118,7 @@ static int encavcodecaInit(hb_work_object_t *w, hb_job_t *job)
// sample_fmt conversion
pv->resample = hb_audio_resample_init(context->sample_fmt,
- context->channel_layout,
- AV_MATRIX_ENCODING_NONE, 0);
+ audio->config.out.mixdown, 0, 0);
hb_audio_resample_set_sample_fmt(pv->resample, AV_SAMPLE_FMT_FLT);
if (hb_audio_resample_update(pv->resample))
{