Merge commit '52c9b0a6c0d02cff6caebcf6989e565e05b55200'

* commit '52c9b0a6c0d02cff6caebcf6989e565e05b55200':
  aarch64: vp8: Port vp8_luma_dc_wht and vp8_idct_dc_add4uv from arm version

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

diff --cc libavcodec/aarch64/vp8dsp_init_aarch64.c
Simple merge

diff --cc libavcodec/aarch64/vp8dsp_neon.S
index 25faa653247e5efdabd3e1cb31e6964f84c3b61e,4ea62c06440fa0973f9836bbb4d1bce451f0fde9..6a727e717c39a5cd5db384eae41b90d1901b8e3f
--- 1/libavcodec/aarch64/vp8dsp_neon.S
--- 2/libavcodec/aarch64/vp8dsp_neon.S
+++ b/libavcodec/aarch64/vp8dsp_neon.S
@@@ -4,10 -4,11 +4,11 @@@
   * Copyright (c) 2010 Rob Clark <rob@ti.com>
   * Copyright (c) 2011 Mans Rullgard <mans@mansr.com>
   * 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.