Skip to content

F
ffmpeg
Commit f696343d authored by Anton Khirnov's avatar Anton Khirnov Committed by James Almer
Browse files
Options

acm: convert to new channel layout API 

Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent ee9c142c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
libavformat/acm.c
View file @ f696343d
......@@ -48,12 +48,12 @@ static int acm_read_header(AVFormatContext *s)
if (ret < 0)
return ret;
st->codecpar->channels = AV_RL16(st->codecpar->extradata + 8);
st->codecpar->ch_layout.nb_channels = AV_RL16(st->codecpar->extradata + 8);
st->codecpar->sample_rate = AV_RL16(st->codecpar->extradata + 10);
if (st->codecpar->channels <= 0 || st->codecpar->sample_rate <= 0)
if (st->codecpar->ch_layout.nb_channels <= 0 || st->codecpar->sample_rate <= 0)
return AVERROR_INVALIDDATA;
st->start_time = 0;
st->duration = AV_RL32(st->codecpar->extradata + 4) / st->codecpar->channels;
st->duration = AV_RL32(st->codecpar->extradata + 4) / st->codecpar->ch_layout.nb_channels;
ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW;
avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
......
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