[x264-devel] commit: Fix C99ism in r1066 (Jason Garrett-Glaser )

[git version control]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Thu Jan  1 21:38:33 2009 -0500| [1e2f6d258df09874e2e0c85ef611f27d397555bf] | committer: Jason Garrett-Glaser 

Fix C99ism in r1066

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

 common/macroblock.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/macroblock.c b/common/macroblock.c
index 9029a34..8ef3a1e 100644
--- a/common/macroblock.c
+++ b/common/macroblock.c
@@ -767,6 +767,7 @@ int x264_macroblock_cache_init( x264_t *h )
 {
     int i, j;
     int i_mb_count = h->mb.i_mb_count;
+    int buf_hpel, buf_ssim, me_range, buf_tesa;
 
     h->mb.i_mb_stride = h->sps->i_mb_width;
     h->mb.i_b8_stride = h->sps->i_mb_width * 2;
@@ -839,10 +840,10 @@ int x264_macroblock_cache_init( x264_t *h )
     h->mb.i_neighbour4[15] =
     h->mb.i_neighbour8[3] = MB_LEFT|MB_TOP|MB_TOPLEFT;
 
-    int buf_hpel = (h->param.i_width+40) * sizeof(int16_t);
-    int buf_ssim = h->param.analyse.b_ssim * 8 * (h->param.i_width/4+3) * sizeof(int);
-    int me_range = X264_MIN(h->param.analyse.i_me_range, h->param.analyse.i_mv_range);
-    int buf_tesa = (h->param.analyse.i_me_method >= X264_ME_ESA) *
+    buf_hpel = (h->param.i_width+40) * sizeof(int16_t);
+    buf_ssim = h->param.analyse.b_ssim * 8 * (h->param.i_width/4+3) * sizeof(int);
+    me_range = X264_MIN(h->param.analyse.i_me_range, h->param.analyse.i_mv_range);
+    buf_tesa = (h->param.analyse.i_me_method >= X264_ME_ESA) *
         ((me_range*2+18) * sizeof(int16_t) + (me_range+1) * (me_range+1) * 4 * sizeof(mvsad_t));
     CHECKED_MALLOC( h->scratch_buffer, X264_MAX3( buf_hpel, buf_ssim, buf_tesa ) );