[FFmpeg-cvslog] Merge commit '516c479172755c63063180b0c0953b68b670cdbd'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 15:21:22 2017 -0300| [0cef66c906a58c7a9811574fc8a734faa818c094] | committer: James Almer

Merge commit '516c479172755c63063180b0c0953b68b670cdbd'

* commit '516c479172755c63063180b0c0953b68b670cdbd':
  checkasm: Test more h264 idct variants

See 2d263188ba87b0d1e1120f00eecae4bb0e163f47

Merged-by: James Almer <jamrial at gmail.com>

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

 tests/checkasm/h264dsp.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/checkasm/h264dsp.c b/tests/checkasm/h264dsp.c
index 741993daa5..5f73bc9f08 100644
--- a/tests/checkasm/h264dsp.c
+++ b/tests/checkasm/h264dsp.c
@@ -228,13 +228,13 @@ static void check_idct(void)
 
 static void check_idct_multiple(void)
 {
-    LOCAL_ALIGNED_16(uint8_t, dst_full,   [16 * 16 * 2]);
-    LOCAL_ALIGNED_16(int16_t, coef_full,  [16 * 16 * 2]);
-    LOCAL_ALIGNED_16(uint8_t, dst0, [16 * 16 * 2]);
-    LOCAL_ALIGNED_16(uint8_t, dst1, [16 * 16 * 2]);
+    LOCAL_ALIGNED_16(uint8_t, dst_full,  [16 * 16 * 2]);
+    LOCAL_ALIGNED_16(int16_t, coef_full, [16 * 16 * 2]);
+    LOCAL_ALIGNED_16(uint8_t, dst0,  [16 * 16 * 2]);
+    LOCAL_ALIGNED_16(uint8_t, dst1,  [16 * 16 * 2]);
     LOCAL_ALIGNED_16(int16_t, coef0, [16 * 16 * 2]);
     LOCAL_ALIGNED_16(int16_t, coef1, [16 * 16 * 2]);
-    LOCAL_ALIGNED_16(uint8_t, nnzc, [15*8]);
+    LOCAL_ALIGNED_16(uint8_t, nnzc,  [15 * 8]);
     H264DSPContext h;
     int bit_depth, i, y, func;
     declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, const int *block_offset, int16_t *block, int stride, const uint8_t nnzc[15*8]);
@@ -285,8 +285,8 @@ static void check_idct_multiple(void)
                            &dst[PIXEL_STRIDE * y], sz * SIZEOF_PIXEL);
 
                 if (nnz > 1)
-                    nnz = sz*sz;
-                memcpy(&coef_full[i*SIZEOF_COEF/sizeof(coef[0])],
+                    nnz = sz * sz;
+                memcpy(&coef_full[i * SIZEOF_COEF/sizeof(coef[0])],
                        coef, nnz * SIZEOF_COEF);
 
                 if (intra && nnz == 1)


======================================================================