From 5fd7a9fcdf472e957b0c2f453f13d7f33e07a4a5 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sat, 26 Apr 2008 14:33:09 +0000 Subject: [PATCH] simplify: merge loops Originally committed as revision 12996 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegaudiodec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 24792ae16f..0334231ecd 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -2572,7 +2572,7 @@ static int decode_frame_mp3on4(AVCodecContext * avctx, OUT_INT decoded_buf[MPA_FRAME_SIZE * MPA_MAX_CHANNELS]; OUT_INT *outptr, *bp; int fsize; - int fr, i, j, n; + int fr, j, n; len = buf_size; @@ -2584,6 +2584,8 @@ static int decode_frame_mp3on4(AVCodecContext * avctx, // If only one decoder interleave is not needed outptr = s->frames == 1 ? out_samples : decoded_buf; + avctx->bit_rate = 0; + for (fr = 0; fr < s->frames; fr++) { fsize = AV_RB16(buf) >> 4; fsize = FFMIN3(fsize, len, MPA_MAX_CODED_FRAME_SIZE); @@ -2619,13 +2621,11 @@ static int decode_frame_mp3on4(AVCodecContext * avctx, } } } + avctx->bit_rate += m->bit_rate; } /* update codec info */ avctx->sample_rate = s->mp3decctx[0]->sample_rate; - avctx->bit_rate = 0; - for (i = 0; i < s->frames; i++) - avctx->bit_rate += s->mp3decctx[i]->bit_rate; *data_size = out_size; return buf_size;