diff fft.c @ 8104:0d108ec85620 libavcodec

Remove duplicated MM_* macros for CPU capabilities from dsputil.h. Add missing one for FF_MM_ALTIVEC to avcodec.h. Rename all the occurences of MM_* to the corresponding FF_MM_*.
author rathann
date Mon, 03 Nov 2008 18:08:00 +0000
parents 8226017a65ae
children 7a463923ecd1
line wrap: on
line diff
--- a/fft.c	Sun Nov 02 21:51:27 2008 +0000
+++ b/fft.c	Mon Nov 03 18:08:00 2008 +0000
@@ -93,18 +93,18 @@
 
 #if defined HAVE_MMX && defined HAVE_YASM
     has_vectors = mm_support();
-    if (has_vectors & MM_SSE) {
+    if (has_vectors & FF_MM_SSE) {
         /* SSE for P3/P4/K8 */
         s->imdct_calc = ff_imdct_calc_sse;
         s->imdct_half = ff_imdct_half_sse;
         s->fft_permute = ff_fft_permute_sse;
         s->fft_calc = ff_fft_calc_sse;
-    } else if (has_vectors & MM_3DNOWEXT) {
+    } else if (has_vectors & FF_MM_3DNOWEXT) {
         /* 3DNowEx for K7 */
         s->imdct_calc = ff_imdct_calc_3dn2;
         s->imdct_half = ff_imdct_half_3dn2;
         s->fft_calc = ff_fft_calc_3dn2;
-    } else if (has_vectors & MM_3DNOW) {
+    } else if (has_vectors & FF_MM_3DNOW) {
         /* 3DNow! for K6-2/3 */
         s->imdct_calc = ff_imdct_calc_3dn;
         s->imdct_half = ff_imdct_half_3dn;
@@ -112,7 +112,7 @@
     }
 #elif defined HAVE_ALTIVEC && !defined ALTIVEC_USE_REFERENCE_C_CODE
     has_vectors = mm_support();
-    if (has_vectors & MM_ALTIVEC) {
+    if (has_vectors & FF_MM_ALTIVEC) {
         s->fft_calc = ff_fft_calc_altivec;
         split_radix = 0;
     }