Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavc/arm: Use the neon vertical chroma loop filter also for H.264 4:2:2.
  lavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/aarch64/h264dsp_init_aarch64.c

@@ -78,6 +78,7 @@ av_cold void ff_h264dsp_init_aarch64(H264DSPContext *c, const int bit_depth,
         c->h264_v_loop_filter_luma   = ff_h264_v_loop_filter_luma_neon;
         c->h264_h_loop_filter_luma   = ff_h264_h_loop_filter_luma_neon;
         c->h264_v_loop_filter_chroma = ff_h264_v_loop_filter_chroma_neon;
+        if (chroma_format_idc <= 1)
         c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon;
 
         c->weight_h264_pixels_tab[0] = ff_weight_h264_pixels_16_neon;

libavcodec/arm/h264dsp_init_arm.c

@@ -76,8 +76,8 @@ static av_cold void h264dsp_init_neon(H264DSPContext *c, const int bit_depth,
     if (bit_depth == 8) {
         c->h264_v_loop_filter_luma   = ff_h264_v_loop_filter_luma_neon;
         c->h264_h_loop_filter_luma   = ff_h264_h_loop_filter_luma_neon;
-        if(chroma_format_idc == 1){
         c->h264_v_loop_filter_chroma = ff_h264_v_loop_filter_chroma_neon;
+        if(chroma_format_idc == 1){
         c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon;
         }