Mercurial > libavcodec.hg

changeset 6702:a9a28c8b40fb libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify: merge loops
author bcoudurier
date Sat, 26 Apr 2008 14:33:09 +0000
parents ef18192d8474
children 656a92752424
files mpegaudiodec.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mpegaudiodec.c	Sat Apr 26 14:30:06 2008 +0000
+++ b/mpegaudiodec.c	Sat Apr 26 14:33:09 2008 +0000
@@ -2572,7 +2572,7 @@
     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 @@
     // 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 @@
                 }
             }
         }
+        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;