Merge commit '205fdd4ea5e1264946917a26fde01e137a485f5a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jun 2014 00:21:21 +0000 (02:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jun 2014 00:22:53 +0000 (02:22 +0200)
* commit '205fdd4ea5e1264946917a26fde01e137a485f5a':
  ppc: Fix runtime CPU detection for apedsp, huffyuvdsp, svq1enc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/ppc/huffyuvdsp_altivec.c
libavcodec/ppc/lossless_audiodsp_altivec.c
libavcodec/ppc/svq1enc_altivec.c

Simple merge
  #endif
  
  #include "libavutil/attributes.h"
+ #include "libavutil/cpu.h"
+ #include "libavutil/ppc/cpu.h"
  #include "libavutil/ppc/types_altivec.h"
 -#include "libavcodec/apedsp.h"
 +#include "libavcodec/lossless_audiodsp.h"
  
  #if HAVE_ALTIVEC
  static int32_t scalarproduct_and_madd_int16_altivec(int16_t *v1,
  }
  #endif /* HAVE_ALTIVEC */
  
 -av_cold void ff_apedsp_init_ppc(APEDSPContext *c)
 +av_cold void ff_llauddsp_init_ppc(LLAudDSPContext *c)
  {
  #if HAVE_ALTIVEC
+     if (!PPC_ALTIVEC(av_get_cpu_flags()))
+         return;
      c->scalarproduct_and_madd_int16 = scalarproduct_and_madd_int16_altivec;
  #endif /* HAVE_ALTIVEC */
  }
Simple merge