diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-31 13:57:59 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:32 -0300 |
| commit | e5818ab328ba33e7a1e462c9a9c992bfc5a8adbc (patch) | |
| tree | c68e275dbf33bbbdcf54387803e06e7c845ed666 | |
| parent | d68f938c2dae8231e8ca38cb37bb86d712fde071 (diff) | |
flac: convert to new channel layout API
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/flacdec.c | 3 | ||||
| -rw-r--r-- | libavformat/flacenc.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 3401aebe8d..bfae5a2af1 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -191,8 +191,7 @@ static int flac_read_header(AVFormatContext *s) av_log(s, AV_LOG_WARNING, "Invalid value of WAVEFORMATEXTENSIBLE_CHANNEL_MASK\n"); } else { - st->codecpar->channel_layout = mask; - st->codecpar->channels = av_get_channel_layout_nb_channels(mask); + av_channel_layout_from_mask(&st->codecpar->ch_layout, mask); av_dict_set(&s->metadata, "WAVEFORMATEXTENSIBLE_CHANNEL_MASK", NULL, 0); } } diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index b267197ccc..cf44ff7001 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -238,9 +238,9 @@ static int flac_init(struct AVFormatContext *s) } /* add the channel layout tag */ - if (par->channel_layout && - !(par->channel_layout & ~0x3ffffULL) && - !ff_flac_is_native_layout(par->channel_layout)) { + if (par->ch_layout.order == AV_CHANNEL_ORDER_NATIVE && + !(par->ch_layout.u.mask & ~0x3ffffULL) && + !ff_flac_is_native_layout(par->ch_layout.u.mask)) { AVDictionaryEntry *chmask = av_dict_get(s->metadata, "WAVEFORMATEXTENSIBLE_CHANNEL_MASK", NULL, 0); @@ -249,7 +249,7 @@ static int flac_init(struct AVFormatContext *s) "already present, this muxer will not overwrite it.\n"); } else { uint8_t buf[32]; - snprintf(buf, sizeof(buf), "0x%"PRIx64, par->channel_layout); + snprintf(buf, sizeof(buf), "0x%"PRIx64, par->ch_layout.u.mask); av_dict_set(&s->metadata, "WAVEFORMATEXTENSIBLE_CHANNEL_MASK", buf, 0); } } |