summaryrefslogtreecommitdiff
path: root/libavformat/tmv.c
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2017-03-31 18:47:25 +0200
committerJames Almer <jamrial@gmail.com>2022-03-15 09:42:38 -0300
commit01910fec68419137a97c74bec08734e288677401 (patch)
tree8ce4b7398bc92c18128a360dd4208d3d7d694b44 /libavformat/tmv.c
parent4792dc1f1a1b1952f4732340836bb91729171188 (diff)
tmv: convert to new channel layout API
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/tmv.c')
-rw-r--r--libavformat/tmv.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/libavformat/tmv.c b/libavformat/tmv.c
index 507f6cd032..ea39954190 100644
--- a/libavformat/tmv.c
+++ b/libavformat/tmv.c
@@ -113,19 +113,13 @@ static int tmv_read_header(AVFormatContext *s)
ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
ast->codecpar->codec_id = AV_CODEC_ID_PCM_U8;
- if (features & TMV_STEREO) {
- ast->codecpar->channels = 2;
- ast->codecpar->channel_layout = AV_CH_LAYOUT_STEREO;
- } else {
- ast->codecpar->channels = 1;
- ast->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
- }
+ av_channel_layout_default(&ast->codecpar->ch_layout, !!(features & TMV_STEREO) + 1);
ast->codecpar->bits_per_coded_sample = 8;
ast->codecpar->bit_rate = ast->codecpar->sample_rate *
ast->codecpar->bits_per_coded_sample;
avpriv_set_pts_info(ast, 32, 1, ast->codecpar->sample_rate);
- fps.num = ast->codecpar->sample_rate * ast->codecpar->channels;
+ fps.num = ast->codecpar->sample_rate * ast->codecpar->ch_layout.nb_channels;
fps.den = tmv->audio_chunk_size;
av_reduce(&fps.num, &fps.den, fps.num, fps.den, 0xFFFFFFFFLL);