[FFmpeg-cvslog] proresenc: make a variable local to the loop where it is used

Mans Rullgard git at videolan.org
Mon Jul 2 21:24:10 CEST 2012


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sun Jul  1 13:38:12 2012 +0100| [1c2c64edac4bd2b65b6d2f8d1489eed40f8a5458] | committer: Mans Rullgard

proresenc: make a variable local to the loop where it is used

This moves the mbs_per_slice declaration inside the only loop
where it is used.  Fixes a dead assignment.

Signed-off-by: Mans Rullgard <mans at mansr.com>

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

 libavcodec/proresenc.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/proresenc.c b/libavcodec/proresenc.c
index bee49ee..f821533 100644
--- a/libavcodec/proresenc.c
+++ b/libavcodec/proresenc.c
@@ -724,7 +724,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     int sizes[4] = { 0 };
     int slice_hdr_size = 2 + 2 * (ctx->num_planes - 1);
     int frame_size, picture_size, slice_size;
-    int mbs_per_slice = ctx->mbs_per_slice;
     int pkt_size, ret;
 
     *avctx->coded_frame           = *pic;
@@ -792,7 +791,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     }
 
     for (y = 0; y < ctx->mb_height; y++) {
-        mbs_per_slice = ctx->mbs_per_slice;
+        int mbs_per_slice = ctx->mbs_per_slice;
         for (x = mb = 0; x < ctx->mb_width; x += mbs_per_slice, mb++) {
             q = ctx->force_quant ? ctx->force_quant
                                  : ctx->slice_q[mb + y * ctx->slices_width];



More information about the ffmpeg-cvslog mailing list