summaryrefslogtreecommitdiffstats
path: root/demux/demux_mkv.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-03-02 22:28:32 +0100
committerwm4 <wm4@nowhere>2016-03-02 22:28:32 +0100
commita19307d598c515627192c752aa6d4341b88078c9 (patch)
tree2f460f7e7935d71e6e1f074436928f2a89d62514 /demux/demux_mkv.c
parentfa8b2be4de852a3fc0ef340543a1f6737d611435 (diff)
downloadmpv-a19307d598c515627192c752aa6d4341b88078c9.tar.bz2
mpv-a19307d598c515627192c752aa6d4341b88078c9.tar.xz
Revert "demux_mkv: pretend waveext channel layouts by default"
This reverts commit af66fa8fa5d8e46b26a08a2b241f03d46abb3c2b. The reverted commit caused AVCodecContext.channel_layout to be set, while requesting stereo downmix will make libavcodec output a stupid message: ac3: Channel layout '5.1' with 6 channels does not match specified number of channels 2: ignoring specified channel layout The same happens with --demuxer=lavf (without this change too). I'm not quite sure what acrobatics are required to shut up libavcodec, but for now revert the commit. It was a rather minor, almost cosmetic issue, which I consider less important than clean CLI terminal output.
Diffstat (limited to 'demux/demux_mkv.c')
-rw-r--r--demux/demux_mkv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index d54b8fadd6..c932b45f39 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -1641,7 +1641,7 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track)
mp_chmap_from_waveext(&sh_a->channels, chmask);
if (sh_a->channels.num != track->a_channels)
- mp_chmap_from_channels(&sh_a->channels, track->a_channels);
+ mp_chmap_set_unknown(&sh_a->channels, track->a_channels);
const char *codec = sh_a->codec;
if (!strcmp(codec, "mp3") || !strcmp(codec, "truehd")) {