Skip to content

F
ffmpeg
Commit ee9c142c authored by James Almer's avatar James Almer
Browse files
Options

ace: convert to new channel layout API 

Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent bca70e79
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavformat/acedec.c
View file @ ee9c142c
...@@ -74,7 +74,7 @@ static int ace_read_header(AVFormatContext *s) ...@@ -74,7 +74,7 @@ static int ace_read_header(AVFormatContext *s)
st->start_time = 0; st->start_time = 0;
par = st->codecpar; par = st->codecpar;
par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_type = AVMEDIA_TYPE_AUDIO;
par->channels = nb_channels; par->ch_layout.nb_channels = nb_channels;
par->sample_rate = rate; par->sample_rate = rate;
par->block_align = (codec == 4 ? 0x60 : codec == 5 ? 0x98 : 0xC0) * nb_channels; par->block_align = (codec == 4 ? 0x60 : codec == 5 ? 0x98 : 0xC0) * nb_channels;
st->duration = (size / par->block_align) * 1024LL; st->duration = (size / par->block_align) * 1024LL;
...@@ -85,7 +85,7 @@ static int ace_read_header(AVFormatContext *s) ...@@ -85,7 +85,7 @@ static int ace_read_header(AVFormatContext *s)
return ret; return ret;
AV_WL16(st->codecpar->extradata, 1); AV_WL16(st->codecpar->extradata, 1);
AV_WL16(st->codecpar->extradata+2, 2048 * par->channels); AV_WL16(st->codecpar->extradata+2, 2048 * nb_channels);
AV_WL16(st->codecpar->extradata+4, 0); AV_WL16(st->codecpar->extradata+4, 0);
AV_WL16(st->codecpar->extradata+6, codec == 4 ? 1 : 0); AV_WL16(st->codecpar->extradata+6, codec == 4 ? 1 : 0);
AV_WL16(st->codecpar->extradata+8, codec == 4 ? 1 : 0); AV_WL16(st->codecpar->extradata+8, codec == 4 ? 1 : 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