Merge commit '28a8b5413b64b831dfb8650208bccd8b78360484'

* commit '28a8b5413b64b831dfb8650208bccd8b78360484':
  h264/aarch64: add intra loop filter neon asm

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

diff --cc libavcodec/aarch64/h264dsp_init_aarch64.c
index eb2014e24d6cb1bbc178b8e4a6543c5edae1d0fa,07bda2ff0718a1da98a1c80e8bb55454a1a6caa6..10cf1993335981f7d1f9c76d72a8c8ba56add658
--- 1/libavcodec/aarch64/h264dsp_init_aarch64.c
--- 2/libavcodec/aarch64/h264dsp_init_aarch64.c
+++ b/libavcodec/aarch64/h264dsp_init_aarch64.c
@@@ -33,21 -37,27 +37,27 @@@ void ff_h264_v_loop_filter_chroma_neon(
                                         int beta, int8_t *tc0);
  void ff_h264_h_loop_filter_chroma_neon(uint8_t *pix, int stride, int alpha,
                                         int beta, int8_t *tc0);
+ void ff_h264_v_loop_filter_chroma_intra_neon(uint8_t *pix, int stride,
+                                              int alpha, int beta);
+ void ff_h264_h_loop_filter_chroma_intra_neon(uint8_t *pix, int stride,
+                                              int alpha, int beta);
+ void ff_h264_h_loop_filter_chroma_mbaff_intra_neon(uint8_t *pix, int 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);
  
@@@ -77,9 -87,14 +87,15 @@@ av_cold void ff_h264dsp_init_aarch64(H2
      if (have_neon(cpu_flags) && 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;
+         c->h264_v_loop_filter_luma_intra= ff_h264_v_loop_filter_luma_intra_neon;
+         c->h264_h_loop_filter_luma_intra= ff_h264_h_loop_filter_luma_intra_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->h264_v_loop_filter_chroma_intra = ff_h264_v_loop_filter_chroma_intra_neon;
+         c->h264_h_loop_filter_chroma_intra = ff_h264_h_loop_filter_chroma_intra_neon;
+         c->h264_h_loop_filter_chroma_mbaff_intra = ff_h264_h_loop_filter_chroma_mbaff_intra_neon;
  
          c->weight_h264_pixels_tab[0] = ff_weight_h264_pixels_16_neon;
          c->weight_h264_pixels_tab[1] = ff_weight_h264_pixels_8_neon;

diff --cc libavcodec/aarch64/h264dsp_neon.S
index 3b759d4d4ae21d185da958de559bec1843bb736e,448e575b8c1fd5f181e89ff8e5b67083f0958b46..80ac09d2be4005ac30fcf1e5b0c5b2d3f54b04a5
--- 1/libavcodec/aarch64/h264dsp_neon.S
--- 2/libavcodec/aarch64/h264dsp_neon.S
+++ b/libavcodec/aarch64/h264dsp_neon.S
@@@ -1,10 -1,11 +1,11 @@@
  /*
   * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
   * Copyright (c) 2013 Janne Grunau <janne-libav@jannau.net>
+  * Copyright (c) 2014 Janne Grunau <janne-libav@jannau.net>
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.