summaryrefslogtreecommitdiffstats
path: root/libhb/decavcodec.c
diff options
context:
space:
mode:
authorRodeo <[email protected]>2012-11-21 18:29:34 +0000
committerRodeo <[email protected]>2012-11-21 18:29:34 +0000
commit282ddc84776683667e417a62186be57b97be3eab (patch)
treefa4f2bd306b5eb06aa28af2bbe507a3f9b8b091b /libhb/decavcodec.c
parent8612b1b6ab0a60a9b9cca384ca62f8a12d3cbb5b (diff)
Improve support for planar audio.
- encavcodecaudio: use libavresample directly (instead of via the hb_audio_resample wrapper), and add support for planar output - hb_audio_resample: add support for planar input - hb_audio_remap: add support for planar input - deca52: output planar float samples (no re-interleaving) git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5073 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/decavcodec.c')
-rw-r--r--libhb/decavcodec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index dd3c8879d..5248d5f52 100644
--- a/libhb/decavcodec.c
+++ b/libhb/decavcodec.c
@@ -190,7 +190,7 @@ static int decavcodecaInit( hb_work_object_t * w, hb_job_t * job )
{
pv->resample =
hb_audio_resample_init(AV_SAMPLE_FMT_FLT,
- w->audio->config.out.mixdown, 1,
+ w->audio->config.out.mixdown,
w->audio->config.out.normalize_mix_level);
if (pv->resample == NULL)
{
@@ -1481,7 +1481,7 @@ static void decodeAudio(hb_audio_t *audio, hb_work_private_t *pv, uint8_t *data,
hb_log("decavcodec: hb_audio_resample_update() failed");
return;
}
- out = hb_audio_resample(pv->resample, (void*)frame.data[0],
+ out = hb_audio_resample(pv->resample, frame.extended_data,
frame.nb_samples);
}