Skip to content

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

fwse: convert to new channel layout API 

Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent 07cdec42
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
libavformat/fwse.c
View file @ 7261f2a1
......@@ -40,6 +40,7 @@ static int fwse_probe(const AVProbeData *p)
static int fwse_read_header(AVFormatContext *s)
{
unsigned start_offset, version;
int channels;
AVIOContext *pb = s->pb;
AVCodecParameters *par;
AVStream *st;
......@@ -59,13 +60,10 @@ static int fwse_read_header(AVFormatContext *s)
par->codec_type = AVMEDIA_TYPE_AUDIO;
par->codec_id = AV_CODEC_ID_ADPCM_IMA_MTF;
par->format = AV_SAMPLE_FMT_S16;
par->channels = avio_rl32(pb);
if (par->channels != 1 && par->channels != 2)
channels = avio_rl32(pb);
if (channels != 1 && channels != 2)
return AVERROR_INVALIDDATA;
if (par->channels == 1)
par->channel_layout = AV_CH_LAYOUT_MONO;
else if (par->channels == 2)
par->channel_layout = AV_CH_LAYOUT_STEREO;
av_channel_layout_default(&par->ch_layout, channels);
st->duration = avio_rl32(pb);
par->sample_rate = avio_rl32(pb);
if (par->sample_rate <= 0 || par->sample_rate > INT_MAX)
......
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