Merge commit 'd7f4f5c4a18a0c9e62635cfa6fe8a9302b413c01'

[ffmpeg] / tests / checkasm / h264dsp.c

diff --git a/tests/checkasm/h264dsp.c b/tests/checkasm/h264dsp.c
index 706fc793976cd120f7154c59b2e5627499aa1ab1..67c742548d91256ad67a88bbcd0aeb1affc37531 100644 (file)
--- a/tests/checkasm/h264dsp.c
+++ b/tests/checkasm/h264dsp.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2016 Martin Storsjo
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -324,7 +324,7 @@ static void check_loop_filter(void)
     int alphas[36], betas[36];
     int8_t tc0[36][4];
 
-    declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *pix, int stride,
+    declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *pix, ptrdiff_t stride,
                       int alpha, int beta, int8_t *tc0);
 
     for (bit_depth = 8; bit_depth <= 10; bit_depth++) {
@@ -384,7 +384,7 @@ static void check_loop_filter_intra(void)
     int bit_depth;
     int alphas[36], betas[36];
 
-    declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *pix, int stride,
+    declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *pix, ptrdiff_t stride,
                       int alpha, int beta);
 
     for (bit_depth = 8; bit_depth <= 10; bit_depth++) {