Merge commit 'f61bece684d9685b07895508e6c1c733b5564ccf'

* commit 'f61bece684d9685b07895508e6c1c733b5564ccf':
  ppc: Add and use convenience macro to check for AltiVec availability

Conflicts:
	libavcodec/ppc/dsputil_ppc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/ppc/dsputil_ppc.c
index 6112b0ccffd2a5f7b5f216aad742e9bf61c5fcaf,6ae6e3f7292eaed1677795e24cd16d62042f0bfe..7454ea0f1e8f35f2f69a357c65bcd83e6c6860b8
--- 1/libavcodec/ppc/dsputil_ppc.c
--- 2/libavcodec/ppc/dsputil_ppc.c
+++ b/libavcodec/ppc/dsputil_ppc.c
@@@ -156,8 -156,7 +157,7 @@@ av_cold void ff_dsputil_init_ppc(DSPCon
      }
      }
  
- #if HAVE_ALTIVEC
-     if (mm_flags & AV_CPU_FLAG_ALTIVEC) {
 -    if (PPC_ALTIVEC(av_get_cpu_flags())) {
++    if (PPC_ALTIVEC(mm_flags)) {
          ff_dsputil_init_altivec(c, avctx);
          ff_int_init_altivec(c, avctx);
          c->gmc1 = ff_gmc1_altivec;

diff --cc libavutil/ppc/cpu.h
index 0000000000000000000000000000000000000000,f8fae586983c4030d72cffeb49b40f5a1e17bce2..0a212f33cbeea3633eaf30e914d7ef9b4a6565c9
mode 000000,100644..100644
--- /dev/null
--- 2/libavutil/ppc/cpu.h
+++ b/libavutil/ppc/cpu.h
@@@ -1,0 -1,28 +1,28 @@@
 - * This file is part of Libav.
+ /*
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * 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.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+ #ifndef AVUTIL_PPC_CPU_H
+ #define AVUTIL_PPC_CPU_H
+ 
+ #include "config.h"
+ #include "libavutil/cpu.h"
+ #include "libavutil/cpu_internal.h"
+ 
+ #define PPC_ALTIVEC(flags) CPUEXT(flags, ALTIVEC)
+ 
+ #endif /* AVUTIL_PPC_CPU_H */

diff --cc libavutil/ppc/float_dsp_init.c
Simple merge

diff --cc libswscale/utils.c
index e34188a14a6c3677e226fc3119cb47d0eeb5d208,c47678cdd2a15edeb1dfa5fe081dd19f4789bff4..4c9b4abe68d6445082ea5a76ac3ee59cc2557232
--- 1/libswscale/utils.c
--- 2/libswscale/utils.c
+++ b/libswscale/utils.c
@@@ -990,13 -806,9 +991,13 @@@ int sws_setColorspaceDetails(struct Sws
                               contrast, saturation);
      // FIXME factorize
  
-     if (HAVE_ALTIVEC && av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)
+     if (PPC_ALTIVEC(av_get_cpu_flags()))
          ff_yuv2rgb_init_tables_altivec(c, inv_table, brightness,
                                         contrast, saturation);
 +    }
 +
 +    fill_rgb2yuv_table(c, table, dstRange);
 +
      return 0;
  }