RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "demux_mkv: pretend waveext channel layouts by default" 

This reverts commit af66fa8fa5.

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.
This commit is contained in:
wm4 2016-03-02 22:28:32 +01:00
parent fa8b2be4de
commit a19307d598
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demux/demux_mkv.c
View File

@ -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")) {