From 71b6115d669feebd7d673bce4d3136b978959de4 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 4 Dec 2013 22:10:22 +0100 Subject: af_channels: use "unknown" channel layouts This will make af_channels output a channel layout that is compatible with any destination layout. Not sure if that's a good idea though, since the way the AO choses a layout is perhaps less predictable. On the other hand, using the old MPlayer standard layouts doesn't make much sense either. We'll see whether this improves or breaks someone's use case. --- audio/filter/af_channels.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/audio/filter/af_channels.c b/audio/filter/af_channels.c index b51e8a431e..3277dff7a6 100644 --- a/audio/filter/af_channels.c +++ b/audio/filter/af_channels.c @@ -141,9 +141,11 @@ static int control(struct af_instance* af, int cmd, void* arg) { af_channels_t* s = af->priv; switch(cmd){ - case AF_CONTROL_REINIT: + case AF_CONTROL_REINIT: ; - mp_audio_set_channels_old(af->data, s->nch); + struct mp_chmap chmap; + mp_chmap_set_unknown(&chmap, s->nch); + mp_audio_set_channels(af->data, &chmap); // Set default channel assignment if(!s->router){ -- cgit v1.2.3