highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aax: convert to new channel layout API

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2021-08-23 22:49:06 -03:00
parent c72095739c
commit bca70e7912
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/aaxdec.c
View File

@ -279,9 +279,9 @@ static int aax_read_header(AVFormatContext *s)
ret = ff_get_extradata(s, par, pb, extradata_size); ret = ff_get_extradata(s, par, pb, extradata_size);
if (ret < 0) if (ret < 0)
return ret; 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); 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; return AVERROR_INVALIDDATA;
avpriv_set_pts_info(st, 64, 32, par->sample_rate); 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; AAXContext *a = s->priv_data;
AVCodecParameters *par = s->streams[0]->codecpar; AVCodecParameters *par = s->streams[0]->codecpar;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
const int size = 18 * par->channels; const int size = 18 * par->ch_layout.nb_channels;
int ret, extradata_size = 0; int ret, extradata_size = 0;
uint8_t *extradata = NULL; uint8_t *extradata = NULL;
int skip = 0; int skip = 0;