[SCM] libav/experimental: Simplify MANGLE macro preprocessor condition checks.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:17:08 UTC 2013


The following commit has been merged in the experimental branch:
commit edfd6975cfdff72cf400f76b91a945e563360e76
Author: Diego Biurrun <diego at biurrun.de>
Date:   Mon Mar 17 09:22:11 2008 +0000

    Simplify MANGLE macro preprocessor condition checks.
    
    Originally committed as revision 12470 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/internal.h b/libavutil/internal.h
index d98ea78..80d3d41 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -127,12 +127,10 @@
 #    else
 #        define MANGLE(a) "_" #a
 #    endif
-#else
-#    if defined(ARCH_X86_64) && defined(PIC)
+#elif defined(ARCH_X86_64) && defined(PIC)
 #        define MANGLE(a) #a"(%%rip)"
-#    else
+#else
 #        define MANGLE(a) #a
-#    endif
 #endif
 
 /* debug stuff */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list