ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Sun Nov 13 23:02:39 2016 +0100| [f75035b06f4b287443fa9275f76183ace39c2d45] | committer: Hendrik Leppkes
Merge commit 'e48746deec48e9ff195841bc3266b4e153a878cd' * commit 'e48746deec48e9ff195841bc3266b4e153a878cd': checkasm: h264dsp: Move the x and y variables into the randomize_buffer macro Merged-by: Hendrik Leppkes <h.lepp...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f75035b06f4b287443fa9275f76183ace39c2d45 --- tests/checkasm/h264dsp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/checkasm/h264dsp.c b/tests/checkasm/h264dsp.c index 2c2603b..9454237 100644 --- a/tests/checkasm/h264dsp.c +++ b/tests/checkasm/h264dsp.c @@ -34,6 +34,7 @@ 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 < PIXEL_STRIDE; x += 4) { \ @@ -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++) { ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
