Merge commit 'bb515e3a735f526ccb1068031e289eb5aeb69e22'

* commit 'bb515e3a735f526ccb1068031e289eb5aeb69e22':
  h264/aarch64: sign extend int stride in loop filter asm

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

diff --combined libavcodec/aarch64/h264dsp_neon.S
index 4ec35f290506e58325b532d079aa15d11d5fd267,60ffa24500a4ae55745fcc325d179352504d3d81..29191e787fcd0aa2ca7723f8d769b2e64ca87bad
--- 1/libavcodec/aarch64/h264dsp_neon.S
--- 2/libavcodec/aarch64/h264dsp_neon.S
+++ b/libavcodec/aarch64/h264dsp_neon.S
@@@ -2,20 -2,20 +2,20 @@@
   * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
   * Copyright (c) 2013 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.
   *
 - * 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
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
@@@ -130,6 -130,7 +130,7 @@@ endfun
  
  function ff_h264_h_loop_filter_luma_neon, export=1
          h264_loop_filter_start
+         sxtw            x1,  w1
  
          sub             x0,  x0,  #4
          ld1             {v6.8B},  [x0], x1
@@@ -210,6 -211,7 +211,7 @@@ endfun
  
  function ff_h264_v_loop_filter_chroma_neon, export=1
          h264_loop_filter_start
+         sxtw            x1,  w1
  
          sub             x0,  x0,  x1, lsl #1
          ld1             {v18.8B}, [x0], x1
@@@ -228,6 -230,7 +230,7 @@@ endfun
  
  function ff_h264_h_loop_filter_chroma_neon, export=1
          h264_loop_filter_start
+         sxtw            x1,  w1
  
          sub             x0,  x0,  #2
          ld1             {v18.S}[0], [x0], x1