Merge commit '0676de935b1e81bc5b5698fef3e7d48ff2ea77ff'

* commit '0676de935b1e81bc5b5698fef3e7d48ff2ea77ff':
  arm: Implement a NEON version of 422 h264_h_loop_filter_chroma

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

diff --cc libavcodec/arm/h264dsp_init_arm.c
index 89402659307d053cd5f2e786d62ebaca31fe1316,617632c59e4b4d0e3d05de9be6d4dafa34a7f037..54e1e38c937f96c24804d64f9ef0ac4fb4818aba
--- 1/libavcodec/arm/h264dsp_init_arm.c
--- 2/libavcodec/arm/h264dsp_init_arm.c
+++ b/libavcodec/arm/h264dsp_init_arm.c
@@@ -25,14 -25,16 +25,16 @@@
  #include "libavcodec/h264dsp.h"
  #include "libavcodec/arm/startcode.h"
  
 -void ff_h264_v_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha,
 +void ff_h264_v_loop_filter_luma_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
                                       int beta, int8_t *tc0);
 -void ff_h264_h_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha,
 +void ff_h264_h_loop_filter_luma_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
                                       int beta, int8_t *tc0);
 -void ff_h264_v_loop_filter_chroma_neon(uint8_t *pix, int stride, int alpha,
 +void ff_h264_v_loop_filter_chroma_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
                                         int beta, int8_t *tc0);
 -void ff_h264_h_loop_filter_chroma_neon(uint8_t *pix, int stride, int alpha,
 +void ff_h264_h_loop_filter_chroma_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
                                         int beta, int8_t *tc0);
 -void ff_h264_h_loop_filter_chroma422_neon(uint8_t *pix, int stride, int alpha,
++void ff_h264_h_loop_filter_chroma422_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
+                                           int beta, int8_t *tc0);
  
  void ff_weight_h264_pixels_16_neon(uint8_t *dst, int stride, int height,
                                     int log2_den, int weight, int offset);

diff --cc libavcodec/arm/h264dsp_neon.S
Simple merge