Mercurial > libavcodec.hg

changeset 9132:37bb2785a35b libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
flacdec: cosmetics: Use a more descriptive variable name for the number of bytes read, instead of reusing 'i'.
author jbr
date Wed, 04 Mar 2009 23:24:44 +0000
parents dfa6b3358c61
children c78af85f414d
files flacdec.c
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/flacdec.c	Wed Mar 04 23:16:30 2009 +0000
+++ b/flacdec.c	Wed Mar 04 23:24:44 2009 +0000
@@ -598,7 +598,7 @@
                             const uint8_t *buf, int buf_size)
 {
     FLACContext *s = avctx->priv_data;
-    int tmp = 0, i, j = 0, input_buf_size = 0;
+    int tmp = 0, i, j = 0, input_buf_size = 0, bytes_read = 0;
     int16_t *samples_16 = data;
     int32_t *samples_32 = data;
     int alloc_data_size= *data_size;
@@ -700,20 +700,20 @@
     *data_size = s->blocksize * s->channels * (s->is32 ? 4 : 2);
 
 end:
-    i= (get_bits_count(&s->gb)+7)/8;
-    if (i > buf_size) {
-        av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", i - buf_size);
+    bytes_read = (get_bits_count(&s->gb)+7)/8;
+    if (bytes_read > buf_size) {
+        av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", bytes_read - buf_size);
         s->bitstream_size=0;
         s->bitstream_index=0;
         return -1;
     }
 
     if (s->bitstream_size) {
-        s->bitstream_index += i;
-        s->bitstream_size  -= i;
+        s->bitstream_index += bytes_read;
+        s->bitstream_size  -= bytes_read;
         return input_buf_size;
     } else
-        return i;
+        return bytes_read;
 }
 
 static av_cold int flac_decode_close(AVCodecContext *avctx)