Merge commit 'd825b1a5306576dcd0553b7d0d24a3a46ad92864'

[ffmpeg] / tests / checkasm / h264dsp.c

diff --git a/tests/checkasm/h264dsp.c b/tests/checkasm/h264dsp.c
index e2060db3bfbafdf62b5225ba34638f5de3836e29..945423703f91a75cb35fb1f53dd94258f69ce241 100644 (file)
--- a/tests/checkasm/h264dsp.c
+++ b/tests/checkasm/h264dsp.c
@@ -34,9 +34,10 @@ static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff };
 
 #define randomize_buffers()                                                  \
     do {                                                                     \
+        int x, y;                                                            \
         uint32_t mask = pixel_mask[bit_depth - 8];                           \
         for (y = 0; y < sz; y++) {                                           \
-            for (x = 0; x < sz * SIZEOF_PIXEL; x += 4) {                     \
+            for (x = 0; x < PIXEL_STRIDE; x += 4) {                          \
                 AV_WN32A(src + y * PIXEL_STRIDE + x, rnd() & mask);          \
                 AV_WN32A(dst + y * PIXEL_STRIDE + x, rnd() & mask);          \
             }                                                                \
@@ -178,8 +179,7 @@ static void check_idct(void)
     LOCAL_ALIGNED_16(int16_t, subcoef0, [8 * 8 * 2]);
     LOCAL_ALIGNED_16(int16_t, subcoef1, [8 * 8 * 2]);
     H264DSPContext h;
-    int bit_depth, sz, align;
-    int x, y, dc;
+    int bit_depth, sz, align, dc;
     declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, int16_t *block, int stride);
 
     for (bit_depth = 8; bit_depth <= 10; bit_depth++) {