Commit bca70e79 authored by James Almer's avatar James Almer

aax: convert to new channel layout API

Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent c7209573
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment