[SCM] libav/experimental: Move DECLARE_ALIGNED and DECLARE_ASM_CONST back from lavu/internal.h to lavu/mem.h.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:48:45 UTC 2013
The following commit has been merged in the experimental branch:
commit 16c2e21488b0da96b445ea4b098b389ca4ef0943
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date: Thu Jul 9 02:20:29 2009 +0000
Move DECLARE_ALIGNED and DECLARE_ASM_CONST back from lavu/internal.h to
lavu/mem.h.
Originally committed as revision 19384 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavutil/internal.h b/libavutil/internal.h
index ccdc545..a80ea24 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -258,21 +258,6 @@ if((y)<(x)){\
}\
}
-#if defined(__ICC) || defined(__SUNPRO_C)
- #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n)))
- #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v
-#elif defined(__GNUC__)
- #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n)))
- #define DECLARE_ASM_CONST(n,t,v) static const t v attribute_used __attribute__ ((aligned (n)))
-#elif defined(_MSC_VER)
- #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v
- #define DECLARE_ASM_CONST(n,t,v) __declspec(align(n)) static const t v
-#else
- #define DECLARE_ALIGNED(n,t,v) t v
- #define DECLARE_ASM_CONST(n,t,v) static const t v
-#endif
-
-
#if !HAVE_LLRINT
static av_always_inline av_const long long llrint(double x)
{
diff --git a/libavutil/mem.h b/libavutil/mem.h
index fe18561..37ba276 100644
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -28,6 +28,21 @@
#include "common.h"
+#if defined(__ICC) || defined(__SUNPRO_C)
+ #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n)))
+ #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v
+#elif defined(__GNUC__)
+ #define DECLARE_ALIGNED(n,t,v) t v __attribute__ ((aligned (n)))
+ #define DECLARE_ASM_CONST(n,t,v) static const t v attribute_used __attribute__ ((aligned (n)))
+#elif defined(_MSC_VER)
+ #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v
+ #define DECLARE_ASM_CONST(n,t,v) __declspec(align(n)) static const t v
+#else
+ #define DECLARE_ALIGNED(n,t,v) t v
+ #define DECLARE_ASM_CONST(n,t,v) static const t v
+#endif
+
+
#if AV_GCC_VERSION_AT_LEAST(3,1)
#define av_malloc_attrib __attribute__((__malloc__))
#else
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list