RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

xvag: convert to new channel layout API 

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Vittorio Giovara 2017-03-31 19:01:03 +02:00 committed by James Almer
parent fdfbc47a0d
commit 4f7c45208e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/xvag.c
View File

@ -52,7 +52,7 @@ static int xvag_read_header(AVFormatContext *s)
offset = av_bswap32(offset);
avio_skip(s->pb, 28);
codec = avio_rb32(s->pb);
st->codecpar->channels = avio_rb32(s->pb);
st->codecpar->ch_layout.nb_channels = avio_rb32(s->pb);
avio_skip(s->pb, 4);
st->duration = avio_rb32(s->pb);
avio_skip(s->pb, 8);
@ -60,7 +60,7 @@ static int xvag_read_header(AVFormatContext *s)
} else {
avio_skip(s->pb, 28);
codec = avio_rl32(s->pb);
st->codecpar->channels = avio_rl32(s->pb);
st->codecpar->ch_layout.nb_channels = avio_rl32(s->pb);
avio_skip(s->pb, 4);
st->duration = avio_rl32(s->pb);
avio_skip(s->pb, 8);
@ -69,13 +69,14 @@ static int xvag_read_header(AVFormatContext *s)
if (st->codecpar->sample_rate <= 0)
return AVERROR_INVALIDDATA;
if (st->codecpar->channels <= 0 || st->codecpar->channels > FF_SANE_NB_CHANNELS)
if (st->codecpar->ch_layout.nb_channels <= 0 ||
st->codecpar->ch_layout.nb_channels > FF_SANE_NB_CHANNELS)
return AVERROR_INVALIDDATA;
switch (codec) {
case 0x1c:
st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX;
st->codecpar->block_align = 16 * st->codecpar->channels;
st->codecpar->block_align = 16 * st->codecpar->ch_layout.nb_channels;
break;
default:
avpriv_request_sample(s, "codec %X", codec);