[FFmpeg-cvslog] r12468 - trunk/libavutil/internal.h

diego subversion
Mon Mar 17 08:49:03 CET 2008


Author: diego
Date: Mon Mar 17 08:49:03 2008
New Revision: 12468

Log:
Fix MANGLE macro on Mac OS X.
Allows compiling a 64 bit FFmpeg on Mac OS X without using --disable-mmx.
patch by ?smail D?nmez  ismail namtrac org


Modified:
   trunk/libavutil/internal.h

Modified: trunk/libavutil/internal.h
==============================================================================
--- trunk/libavutil/internal.h	(original)
+++ trunk/libavutil/internal.h	Mon Mar 17 08:49:03 2008
@@ -120,7 +120,8 @@
 
 // Use rip-relative addressing if compiling PIC code on x86-64.
 #if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__DJGPP__) || \
-    defined(__OS2__) || (defined (__OpenBSD__) && !defined(__ELF__))
+    defined(__OS2__) || defined(__APPLE__) || \
+    (defined (__OpenBSD__) && !defined(__ELF__))
 #    if defined(ARCH_X86_64) && defined(PIC)
 #        define MANGLE(a) "_" #a"(%%rip)"
 #    else
@@ -129,8 +130,6 @@
 #else
 #    if defined(ARCH_X86_64) && defined(PIC)
 #        define MANGLE(a) #a"(%%rip)"
-#    elif defined(__APPLE__)
-#        define MANGLE(a) "_" #a
 #    else
 #        define MANGLE(a) #a
 #    endif




More information about the ffmpeg-cvslog mailing list