diff options
| author | Jan Ekström <jeebjp@gmail.com> | 2022-06-01 23:57:56 +0300 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2022-06-12 21:05:59 +0300 |
| commit | 46b19aedc6c091219a936c3dfc9ac7bbb738e513 (patch) | |
| tree | 4d4e26e3c6667facf189032d1895a39e48a15452 | |
| parent | 302acb27c8065420bc2b5635ac7a9c5edc68703d (diff) | |
| download | mpv-46b19aedc6c091219a936c3dfc9ac7bbb738e513.tar.bz2 mpv-46b19aedc6c091219a936c3dfc9ac7bbb738e513.tar.xz | |
common/av_common: switch to AVChannelLayout when available
| -rw-r--r-- | common/av_common.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/common/av_common.c b/common/av_common.c index bd82d75be8..8b5a3970d0 100644 --- a/common/av_common.c +++ b/common/av_common.c @@ -30,6 +30,7 @@ #include "config.h" +#include "audio/chmap_avchannel.h" #include "common/common.h" #include "common/msg.h" #include "demux/packet.h" @@ -108,9 +109,14 @@ AVCodecParameters *mp_codec_params_to_av(struct mp_codec_params *c) avp->sample_rate = c->samplerate; avp->bit_rate = c->bitrate; avp->block_align = c->block_align; + +#if !HAVE_AV_CHANNEL_LAYOUT avp->channels = c->channels.num; if (!mp_chmap_is_unknown(&c->channels)) avp->channel_layout = mp_chmap_to_lavc(&c->channels); +#else + mp_chmap_to_av_layout(&avp->ch_layout, &c->channels); +#endif return avp; error: |