[FFmpeg-cvslog] ppc/cpu: make linux 32bit specific altivec detection depend on __linux__

Michael Niedermayer git at videolan.org
Mon Sep 24 13:47:21 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 24 13:24:00 2012 +0200| [874b9dcc4be78847e488df33aad51752a8bebc2e] | committer: Michael Niedermayer

ppc/cpu: make linux 32bit specific altivec detection depend on __linux__

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=874b9dcc4be78847e488df33aad51752a8bebc2e
---

 libavutil/ppc/cpu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/ppc/cpu.c b/libavutil/ppc/cpu.c
index fc38be6..20837da 100644
--- a/libavutil/ppc/cpu.c
+++ b/libavutil/ppc/cpu.c
@@ -61,7 +61,7 @@ int ff_get_cpu_flags_ppc(void)
     if (err == 0)
         return has_vu ? AV_CPU_FLAG_ALTIVEC : 0;
     return 0;
-#elif CONFIG_RUNTIME_CPUDETECT
+#elif CONFIG_RUNTIME_CPUDETECT && defined(__linux__) && !ARCH_PPC64
     int proc_ver;
     // Support of mfspr PVR emulation added in Linux 2.6.17.
     __asm__ volatile("mfspr %0, 287" : "=r" (proc_ver));



More information about the ffmpeg-cvslog mailing list