From 68e57cde68f3da4c557ca15491fda74d1ea6321e Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Thu, 11 Jul 2013 16:30:18 +0300 Subject: ac3dec: Increment channel pointers only once per channel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the channel mapping map multiple output channels to one input channel, we should only increment the actual pointer once. Cc: libav-stable@libav.org Signed-off-by: Martin Storsjö --- libavcodec/ac3dec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index abfd380b82..01da328d56 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1393,10 +1393,10 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, if (err) for (ch = 0; ch < s->out_channels; ch++) memcpy(s->outptr[channel_map[ch]], output[ch], 1024); - for (ch = 0; ch < s->out_channels; ch++) { + for (ch = 0; ch < s->out_channels; ch++) output[ch] = s->outptr[channel_map[ch]]; - s->outptr[channel_map[ch]] += AC3_BLOCK_SIZE; - } + for (ch = 0; ch < s->channels; ch++) + s->outptr[ch] += AC3_BLOCK_SIZE; } /* keep last block for error concealment in next frame */ -- cgit v1.2.3