summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-04 22:10:22 +0100
committerwm4 <wm4@nowhere>2013-12-04 23:13:46 +0100
commit71b6115d669feebd7d673bce4d3136b978959de4 (patch)
treeb87273bd03c7e722590124363d959d3a611907c4
parent4f581a781bc1c0f82bc4a145b9ea808466aff657 (diff)
downloadmpv-71b6115d669feebd7d673bce4d3136b978959de4.tar.bz2
mpv-71b6115d669feebd7d673bce4d3136b978959de4.tar.xz
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.
-rw-r--r--audio/filter/af_channels.c6
1 files 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){