Merge commit '186bd30aa3b6c2b29b4dbf18278700b572068b1e'

* commit '186bd30aa3b6c2b29b4dbf18278700b572068b1e':
  h264/arm64: implement missing 4:2:2 chroma loop filter neon functions

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

diff --cc libavcodec/aarch64/h264dsp_init_aarch64.c
index 649d2ab1d74688bb9eaf88096f6b54167ff0451b,85fea8e040b165d3a70d10a8f354f2d6929e05bd..d5baccf2355efb4676f5b999df53056cff1185b3
--- 1/libavcodec/aarch64/h264dsp_init_aarch64.c
--- 2/libavcodec/aarch64/h264dsp_init_aarch64.c
+++ b/libavcodec/aarch64/h264dsp_init_aarch64.c
@@@ -25,39 -25,43 +25,43 @@@
  #include "libavutil/aarch64/cpu.h"
  #include "libavcodec/h264dsp.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_luma_intra_neon(uint8_t *pix, int stride, int alpha,
 +void ff_h264_v_loop_filter_luma_intra_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
                                             int beta);
 -void ff_h264_h_loop_filter_luma_intra_neon(uint8_t *pix, int stride, int alpha,
 +void ff_h264_h_loop_filter_luma_intra_neon(uint8_t *pix, ptrdiff_t stride, int alpha,
                                             int beta);
 -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_h264_v_loop_filter_chroma_intra_neon(uint8_t *pix, int stride,
 +void ff_h264_v_loop_filter_chroma_intra_neon(uint8_t *pix, ptrdiff_t stride,
                                               int alpha, int beta);
 -void ff_h264_h_loop_filter_chroma_intra_neon(uint8_t *pix, int stride,
 +void ff_h264_h_loop_filter_chroma_intra_neon(uint8_t *pix, ptrdiff_t stride,
                                               int alpha, int beta);
 -void ff_h264_h_loop_filter_chroma422_intra_neon(uint8_t *pix, int stride,
++void ff_h264_h_loop_filter_chroma422_intra_neon(uint8_t *pix, ptrdiff_t stride,
+                                                 int alpha, int beta);
 -void ff_h264_h_loop_filter_chroma_mbaff_intra_neon(uint8_t *pix, int stride,
 +void ff_h264_h_loop_filter_chroma_mbaff_intra_neon(uint8_t *pix, ptrdiff_t stride,
                                                     int alpha, int beta);
  
 -void ff_weight_h264_pixels_16_neon(uint8_t *dst, int stride, int height,
 +void ff_weight_h264_pixels_16_neon(uint8_t *dst, ptrdiff_t stride, int height,
                                     int log2_den, int weight, int offset);
 -void ff_weight_h264_pixels_8_neon(uint8_t *dst, int stride, int height,
 +void ff_weight_h264_pixels_8_neon(uint8_t *dst, ptrdiff_t stride, int height,
                                    int log2_den, int weight, int offset);
 -void ff_weight_h264_pixels_4_neon(uint8_t *dst, int stride, int height,
 +void ff_weight_h264_pixels_4_neon(uint8_t *dst, ptrdiff_t stride, int height,
                                    int log2_den, int weight, int offset);
  
 -void ff_biweight_h264_pixels_16_neon(uint8_t *dst, uint8_t *src, int stride,
 +void ff_biweight_h264_pixels_16_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride,
                                       int height, int log2_den, int weightd,
                                       int weights, int offset);
 -void ff_biweight_h264_pixels_8_neon(uint8_t *dst, uint8_t *src, int stride,
 +void ff_biweight_h264_pixels_8_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride,
                                      int height, int log2_den, int weightd,
                                      int weights, int offset);
 -void ff_biweight_h264_pixels_4_neon(uint8_t *dst, uint8_t *src, int stride,
 +void ff_biweight_h264_pixels_4_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride,
                                      int height, int log2_den, int weightd,
                                      int weights, int offset);
  

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