Merge commit '0801853e640624537db386727b36fa97aa6258e7'

* commit '0801853e640624537db386727b36fa97aa6258e7':
  libavcodec: vp8 neon optimizations for aarch64

See 833fed5253617924c41132e0ab261c1d8c076360

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

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

diff --cc libavcodec/vp8dsp.c
index 30452bf5f85f04aa610cee990238e3d0316a1343,ac9a6affc9b509184d7e1e4e10b34423380bbcf7..4ff63d078425873ba9280efc6e564a935a89de1c
--- 1/libavcodec/vp8dsp.c
--- 2/libavcodec/vp8dsp.c
+++ b/libavcodec/vp8dsp.c
@@@ -739,9 -747,5 +741,7 @@@ av_cold void ff_vp8dsp_init(VP8DSPConte
          ff_vp8dsp_init_arm(dsp);
      if (ARCH_X86)
          ff_vp8dsp_init_x86(dsp);
-     if (ARCH_AARCH64)
-         ff_vp8dsp_init_aarch64(dsp);
 +    if (ARCH_MIPS)
 +        ff_vp8dsp_init_mips(dsp);
  }
  #endif /* CONFIG_VP8_DECODER */