summaryrefslogtreecommitdiff
path: root/libavformat/pcmdec.c
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2017-03-31 18:06:05 +0200
committerJames Almer <jamrial@gmail.com>2022-03-15 09:42:36 -0300
commit5347f2920f188f5c026108193fa9c54df8afc34c (patch)
treefcb4e488d88b480d71fec79a8916efc07e906850 /libavformat/pcmdec.c
parent57141d73c7005565137f25fe10bcebd58070343b (diff)
pcm: convert to 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 'libavformat/pcmdec.c')
-rw-r--r--libavformat/pcmdec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c
index 63539a47c0..24e9591454 100644
--- a/libavformat/pcmdec.c
+++ b/libavformat/pcmdec.c
@@ -48,7 +48,7 @@ static int pcm_read_header(AVFormatContext *s)
par->codec_type = AVMEDIA_TYPE_AUDIO;
par->codec_id = s->iformat->raw_codec_id;
par->sample_rate = s1->sample_rate;
- par->channels = s1->channels;
+ par->ch_layout.nb_channels = s1->channels;
av_opt_get(s->pb, "mime_type", AV_OPT_SEARCH_CHILDREN, &mime_type);
if (mime_type && s->iformat->mime_type) {
@@ -77,7 +77,7 @@ static int pcm_read_header(AVFormatContext *s)
}
par->sample_rate = rate;
if (channels > 0)
- par->channels = channels;
+ par->ch_layout.nb_channels = channels;
if (little_endian)
par->codec_id = AV_CODEC_ID_PCM_S16LE;
}
@@ -88,7 +88,7 @@ static int pcm_read_header(AVFormatContext *s)
av_assert0(par->bits_per_coded_sample > 0);
- par->block_align = par->bits_per_coded_sample * par->channels / 8;
+ par->block_align = par->bits_per_coded_sample * par->ch_layout.nb_channels / 8;
avpriv_set_pts_info(st, 64, 1, par->sample_rate);
return 0;