diff options
author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-31 19:07:54 +0200 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:29 -0300 |
commit | 276c06726fbd2f784d51189870bd834e9284812f (patch) | |
tree | 31dafced275e0a85c33bc4b79ef08b2dfab3d7e8 /libavcodec/utils.c | |
parent | db6efa1815e217ed76f39aee8b15ee5c64698537 (diff) |
avcodecpar: switch to the new channel layout API
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r-- | libavcodec/utils.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 066da76e16..643c90f1f1 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -814,8 +814,16 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes) int av_get_audio_frame_duration2(AVCodecParameters *par, int frame_bytes) { - int duration = get_audio_frame_duration(par->codec_id, par->sample_rate, - par->channels, par->block_align, + int channels = par->ch_layout.nb_channels; + int duration; +#if FF_API_OLD_CHANNEL_LAYOUT +FF_DISABLE_DEPRECATION_WARNINGS + if (!channels) + channels = par->channels; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + duration = get_audio_frame_duration(par->codec_id, par->sample_rate, + channels, par->block_align, par->codec_tag, par->bits_per_coded_sample, par->bit_rate, par->extradata, par->frame_size, frame_bytes); |