diff options
author | wm4 <wm4@nowhere> | 2013-04-05 20:39:52 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-05-12 21:24:54 +0200 |
commit | 7971bb87cb46f90152913de6ac673ae3bd1637a3 (patch) | |
tree | 7929e829c5960425270f4f0c017d84c37872ac5b /audio/filter/af_surround.c | |
parent | f7a427676c0fe3c12509e3d9a243301f93626b0a (diff) | |
download | mpv-7971bb87cb46f90152913de6ac673ae3bd1637a3.tar.bz2 mpv-7971bb87cb46f90152913de6ac673ae3bd1637a3.tar.xz |
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.
Diffstat (limited to 'audio/filter/af_surround.c')
-rw-r--r-- | audio/filter/af_surround.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |