Merge commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 13:11:05 +0000 (15:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 13:11:05 +0000 (15:11 +0200)
* commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6':
  ppc: idctdsp: Immediately return if no AltiVec is available

Conflicts:
libavcodec/ppc/idctdsp.c

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

@@@ -247,15 -231,15 +247,16 @@@ av_cold void ff_idctdsp_init_ppc(IDCTDS
                                   unsigned high_bit_depth)
  {
  #if HAVE_ALTIVEC
-     if (PPC_ALTIVEC(av_get_cpu_flags())) {
-         if (!high_bit_depth && avctx->lowres == 0) {
-             if ((avctx->idct_algo == FF_IDCT_AUTO && !(avctx->flags & CODEC_FLAG_BITEXACT)) ||
-                 (avctx->idct_algo == FF_IDCT_ALTIVEC)) {
-                 c->idct      = idct_altivec;
-                 c->idct_add  = idct_add_altivec;
-                 c->idct_put  = idct_put_altivec;
-                 c->perm_type = FF_IDCT_PERM_TRANSPOSE;
-             }
+     if (!PPC_ALTIVEC(av_get_cpu_flags()))
+         return;
 -    if (!high_bit_depth) {
 -        if ((avctx->idct_algo == FF_IDCT_AUTO) ||
++    if (!high_bit_depth && avctx->lowres == 0) {
++        if ((avctx->idct_algo == FF_IDCT_AUTO && !(avctx->flags & CODEC_FLAG_BITEXACT)) ||
+             (avctx->idct_algo == FF_IDCT_ALTIVEC)) {
++            c->idct      = idct_altivec;
+             c->idct_add  = idct_add_altivec;
+             c->idct_put  = idct_put_altivec;
+             c->perm_type = FF_IDCT_PERM_TRANSPOSE;
          }
      }
  #endif /* HAVE_ALTIVEC */