Merge commit '49f9c4272c4029b57ff300d908ba03c6332fc9c4'

* commit '49f9c4272c4029b57ff300d908ba03c6332fc9c4':
  aarch64: vp8: Skip saturating in shrn in ff_vp8_idct_add_neon

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

diff --combined libavcodec/aarch64/vp8dsp_neon.S
index c9c5018c82417354b7dd9cf1c52a6eb617844374,cac4558ab245315663511bae3bc4b6974183bee6..be4f26c481b27b7172b617bca5d807a70ee29667
--- 1/libavcodec/aarch64/vp8dsp_neon.S
--- 2/libavcodec/aarch64/vp8dsp_neon.S
+++ b/libavcodec/aarch64/vp8dsp_neon.S
@@@ -6,20 -6,20 +6,20 @@@
   * Copyright (c) 2018 Magnus Röös <mla2.roos@gmail.com>
   * Copyright (c) 2019 Martin Storsjo <martin@martin.st>
   *
 - * 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
   */
  
@@@ -92,8 -92,8 +92,8 @@@ function ff_vp8_idct_add_neon, export=
          smull           v27.4s, v3.4h,  v4.h[0]
          sqdmulh         v20.4h, v1.4h,  v4.h[1]
          sqdmulh         v23.4h, v3.4h,  v4.h[1]
-         sqshrn          v21.4h, v26.4s, #16
-         sqshrn          v22.4h, v27.4s, #16
+         shrn            v21.4h, v26.4s, #16
+         shrn            v22.4h, v27.4s, #16
          add             v21.4h, v21.4h, v1.4h
          add             v22.4h, v22.4h, v3.4h
  
@@@ -117,8 -117,8 +117,8 @@@
          st1             {v29.16b},  [x1]
          sqdmulh         v21.4h,     v1.4h,  v4.h[1]
          sqdmulh         v23.4h,     v3.4h,  v4.h[1]
-         sqshrn          v20.4h,     v26.4s, #16
-         sqshrn          v22.4h,     v27.4s, #16
+         shrn            v20.4h,     v26.4s, #16
+         shrn            v22.4h,     v27.4s, #16
          add             v20.4h,     v20.4h, v1.4h
          add             v22.4h,     v22.4h, v3.4h
          add             v16.4h,     v0.4h,  v2.4h