Merge commit 'caccb3a0cdc7ee32cbed7eab156d35025133eadc'

* commit 'caccb3a0cdc7ee32cbed7eab156d35025133eadc':
  audiodsp: ppc: Add VSX variant

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc libavcodec/ppc/audiodsp.c
index c88c3d91671944a8514e060664f502579311f73f,289bb58c426e406d8569070cc714211a16aaa61e..4ee3da42d2ee1e32d933e6b56df648d5cd8a05ce
--- 1/libavcodec/ppc/audiodsp.c
--- 2/libavcodec/ppc/audiodsp.c
+++ b/libavcodec/ppc/audiodsp.c
@@@ -61,9 -61,34 +61,34 @@@ static int32_t scalarproduct_int16_alti
  
  #endif /* HAVE_ALTIVEC */
  
+ #if HAVE_VSX
+ 
+ static int32_t scalarproduct_int16_vsx(const int16_t *v1, const int16_t *v2, int order)
+ {
+     int i;
+     LOAD_ZERO;
+     register vec_s16 vec1;
+     register vec_s32 res = vec_splat_s32(0), t;
+     int32_t ires;
+ 
+     for (i = 0; i < order; i += 8) {
+         vec1 = vec_vsx_ld(0, v1);
+         t    = vec_msum(vec1, vec_ld(0, v2), zero_s32v);
+         res  = vec_sums(t, res);
+         v1  += 8;
+         v2  += 8;
+     }
+     res = vec_splat(res, 3);
+     vec_ste(res, 0, &ires);
+ 
+     return ires;
+ }
+ 
+ #endif /* HAVE_VSX */
+ 
  av_cold void ff_audiodsp_init_ppc(AudioDSPContext *c)
  {
 -#if HAVE_ALTIVEC && HAVE_BIGENDIAN
 +#if HAVE_ALTIVEC
      if (!PPC_ALTIVEC(av_get_cpu_flags()))
          return;