From bd4cdef5a8ca0389f8266a172988bd74aaaf4c77 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sun, 23 Dec 2012 13:20:59 -0500 Subject: au: set block_align and use it in au_read_packet() --- libavformat/au.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavformat/au.c') diff --git a/libavformat/au.c b/libavformat/au.c index f1038da64b..fcc599ba96 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -112,6 +112,7 @@ static int au_read_header(AVFormatContext *s) st->codec->channels = channels; st->codec->sample_rate = rate; st->codec->bit_rate = channels * rate * bps; + st->codec->block_align = channels * bps >> 3; avpriv_set_pts_info(st, 64, 1, rate); return 0; } @@ -123,9 +124,8 @@ static int au_read_packet(AVFormatContext *s, { int ret; - ret= av_get_packet(s->pb, pkt, BLOCK_SIZE * - s->streams[0]->codec->channels * - av_get_bits_per_sample(s->streams[0]->codec->codec_id) >> 3); + ret = av_get_packet(s->pb, pkt, BLOCK_SIZE * + s->streams[0]->codec->block_align); if (ret < 0) return ret; pkt->stream_index = 0; -- cgit v1.2.3