[FFmpeg-cvslog] apedec: do not needlessly copy s->samples to nblocks.

[Justin Ruggles]

ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Mon Oct 31 15:10:19 2011 -0400| [de157f2118eeebedd28f4fd1ed448787abd837f8] | committer: Justin Ruggles

apedec: do not needlessly copy s->samples to nblocks.

also move nblocks to the local scope where it is used.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=de157f2118eeebedd28f4fd1ed448787abd837f8
---

 libavcodec/apedec.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 1567025..72b4112 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -814,7 +814,6 @@ static int ape_decode_frame(AVCodecContext *avctx,
     int buf_size = avpkt->size;
     APEContext *s = avctx->priv_data;
     int16_t *samples = data;
-    uint32_t nblocks;
     int i;
     int blockstodecode, out_size;
     int bytes_used;
@@ -824,7 +823,7 @@ static int ape_decode_frame(AVCodecContext *avctx,
     av_assert0(s->samples >= 0);
 
     if(!s->samples){
-        uint32_t offset;
+        uint32_t nblocks, offset;
         void *tmp_data;
 
         if (buf_size < 8) {
@@ -874,8 +873,7 @@ static int ape_decode_frame(AVCodecContext *avctx,
         return buf_size;
     }
 
-    nblocks = s->samples;
-    blockstodecode = FFMIN(BLOCKS_PER_LOOP, nblocks);
+    blockstodecode = FFMIN(BLOCKS_PER_LOOP, s->samples);
 
     out_size = blockstodecode * avctx->channels *
                av_get_bytes_per_sample(avctx->sample_fmt);