summaryrefslogtreecommitdiff
path: root/libavformat/bit.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2019-05-13 11:11:26 +0200
committerJames Almer <jamrial@gmail.com>2022-03-15 09:42:30 -0300
commitfc5e819f6562f743fe9c7d6305dbb16c093628af (patch)
treeb82c84411d1c8b7221e8e4b98845a0097f2b8c99 /libavformat/bit.c
parentf508915777a5246290c06d47a115581bfbe05fee (diff)
downloadffmpeg-fc5e819f6562f743fe9c7d6305dbb16c093628af.tar.gz
bit: convert to new channel layout API
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/bit.c')
-rw-r--r--libavformat/bit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/bit.c b/libavformat/bit.c
index 380cbd37cd..65141c0dcc 100644
--- a/libavformat/bit.c
+++ b/libavformat/bit.c
@@ -63,7 +63,7 @@ static int read_header(AVFormatContext *s)
st->codecpar->codec_id=AV_CODEC_ID_G729;
st->codecpar->sample_rate=8000;
st->codecpar->block_align = 16;
- st->codecpar->channels=1;
+ st->codecpar->ch_layout.nb_channels = 1;
avpriv_set_pts_info(st, 64, 1, 100);
return 0;
@@ -124,14 +124,14 @@ static int write_header(AVFormatContext *s)
{
AVCodecParameters *par = s->streams[0]->codecpar;
- if ((par->codec_id != AV_CODEC_ID_G729) || par->channels != 1) {
+ if ((par->codec_id != AV_CODEC_ID_G729) || par->ch_layout.nb_channels != 1) {
av_log(s, AV_LOG_ERROR,
"only codec g729 with 1 channel is supported by this format\n");
return AVERROR(EINVAL);
}
par->bits_per_coded_sample = 16;
- par->block_align = (par->bits_per_coded_sample * par->channels) >> 3;
+ par->block_align = (par->bits_per_coded_sample * par->ch_layout.nb_channels) >> 3;
return 0;
}