diff options
| author | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
| commit | e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2 (patch) | |
| tree | 08b54ef9bb771434fc7fbe9185793503d3ba314c /demux/demux_lavf.c | |
| parent | 6a83ef1552de4a1a71da49e45647ce1a4ce64e53 (diff) | |
| parent | 48f94311516dc1426644b3e68b2a48c22727e1e7 (diff) | |
| download | mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.bz2 mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.xz | |
Merge branch 'audio_changes'
Conflicts:
audio/out/ao_lavc.c
Diffstat (limited to 'demux/demux_lavf.c')
| -rw-r--r-- | demux/demux_lavf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index e11d28c043..279f7f7b33 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -340,7 +340,9 @@ static void handle_stream(demuxer_t *demuxer, int i) sh_audio->format = codec->codec_tag; // probably unneeded - sh_audio->channels = codec->channels; + mp_chmap_from_channels(&sh_audio->channels, codec->channels); + if (codec->channel_layout) + mp_chmap_from_lavc(&sh_audio->channels, codec->channel_layout); sh_audio->samplerate = codec->sample_rate; sh_audio->i_bps = codec->bit_rate / 8; |