From 7971bb87cb46f90152913de6ac673ae3bd1637a3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 5 Apr 2013 20:39:52 +0200 Subject: af: use mp_chmap for mp_audio, include channel map in format negotiation Now af_lavrresample pretends to reorder the channels, although it doesn't yet, and nothing sets non-standard layouts either. --- audio/filter/af_surround.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'audio/filter/af_surround.c') diff --git a/audio/filter/af_surround.c b/audio/filter/af_surround.c index c63105481f..c04a039d65 100644 --- a/audio/filter/af_surround.c +++ b/audio/filter/af_surround.c @@ -93,7 +93,7 @@ static int control(struct af_instance* af, int cmd, void* arg) case AF_CONTROL_REINIT:{ float fc; mp_audio_copy_config(af->data, (struct mp_audio*)arg); - mp_audio_set_num_channels(af->data, ((struct mp_audio*)arg)->nch*2); + mp_audio_set_channels_old(af->data, ((struct mp_audio*)arg)->nch*2); mp_audio_set_format(af->data, AF_FORMAT_FLOAT_NE); if (af->data->nch != 4){ @@ -242,7 +242,7 @@ static struct mp_audio* play(struct af_instance* af, struct mp_audio* data){ // Set output data data->audio = af->data->audio; data->len *= 2; - mp_audio_set_num_channels(data, af->data->nch); + mp_audio_set_channels_old(data, af->data->nch); return data; } -- cgit v1.2.3