core: use channel map on demuxer level too

This helps passing the channel layout correctly from decoder to audio
filter chain. (Because that part "reuses" the demuxer level codec
parameters, which is very disgusting.)

Note that ffmpeg stuff already passed the channel layout via
mp_copy_lav_codec_headers(). So other than easier dealing with the
demuxer/decoder parameters mess, there's no real advantage to doing
this.

Make the --channels option accept a channel map. Since simple numbers
map to standard layouts with the given number of channels, this is
downwards compatible. Likewise for demux_rawaudio.

1 files changed, 2 insertions, 0 deletions

diff --git a/core/m_option.h b/core/m_option.h
index 66e7208801..e365b3eedc 100644
--- a/core/m_option.h
+++ b/core/m_option.h
@@ -25,6 +25,7 @@
 
 #include "config.h"
 #include "core/bstr.h"
+#include "audio/chmap.h"
 
 // m_option allows to parse, print and copy data of various types.
 
@@ -210,6 +211,7 @@ union m_option_value {
     struct m_color color;
     struct m_geometry geometry;
     struct m_geometry size_box;
+    struct mp_chmap chmap;
 };
 
 ////////////////////////////////////////////////////////////////////////////