diff options
| author | James Almer <jamrial@gmail.com> | 2021-08-23 22:49:06 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:29 -0300 |
| commit | bca70e79127f2e6ad0e3e42494c2dbfc2e4f632a (patch) | |
| tree | bf0fae41655f5056f69d29b321110bfb142baa9c /libavformat/aaxdec.c | |
| parent | c72095739c3aca02499a3c451ae7874676eedd7e (diff) | |
| download | ffmpeg-bca70e79127f2e6ad0e3e42494c2dbfc2e4f632a.tar.gz | |
aax: convert to new channel layout API
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/aaxdec.c')
| -rw-r--r-- | libavformat/aaxdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/aaxdec.c b/libavformat/aaxdec.c index b08ee036ed..0ae4057a53 100644 --- a/libavformat/aaxdec.c +++ b/libavformat/aaxdec.c @@ -279,9 +279,9 @@ static int aax_read_header(AVFormatContext *s) ret = ff_get_extradata(s, par, pb, extradata_size); if (ret < 0) return ret; - par->channels = AV_RB8 (par->extradata + 7); + par->ch_layout.nb_channels = AV_RB8 (par->extradata + 7); par->sample_rate = AV_RB32(par->extradata + 8); - if (!par->channels || !par->sample_rate) + if (!par->ch_layout.nb_channels || !par->sample_rate) return AVERROR_INVALIDDATA; avpriv_set_pts_info(st, 64, 32, par->sample_rate); @@ -299,7 +299,7 @@ static int aax_read_packet(AVFormatContext *s, AVPacket *pkt) AAXContext *a = s->priv_data; AVCodecParameters *par = s->streams[0]->codecpar; AVIOContext *pb = s->pb; - const int size = 18 * par->channels; + const int size = 18 * par->ch_layout.nb_channels; int ret, extradata_size = 0; uint8_t *extradata = NULL; int skip = 0; |