[FFmpeg-cvslog] r17815 - trunk/libavcodec/flacdec.c

[jbr]

Author: jbr
Date: Thu Mar  5 00:24:44 2009
New Revision: 17815

Log:
flacdec: cosmetics: Use a more descriptive variable name for the number 
of bytes read, instead of reusing 'i'.

Modified:
   trunk/libavcodec/flacdec.c

Modified: trunk/libavcodec/flacdec.c
==============================================================================
--- trunk/libavcodec/flacdec.c	Thu Mar  5 00:16:30 2009	(r17814)
+++ trunk/libavcodec/flacdec.c	Thu Mar  5 00:24:44 2009	(r17815)
@@ -598,7 +598,7 @@ static int flac_decode_frame(AVCodecCont
                             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 @@ static int flac_decode_frame(AVCodecCont
     *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)