[FFmpeg-cvslog] Make LOCAL_ALIGNED syntactically similar on all systems

Mans Rullgard git at videolan.org
Wed Dec 12 10:01:13 CET 2012


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Fri Dec  7 23:03:01 2012 +0000| [02823f6d7188260dabb10c64d6dd74331e7772e0] | committer: Mans Rullgard

Make LOCAL_ALIGNED syntactically similar on all systems

This changes the LOCAL_ALIGNED definition on systems where
DECLARE_ALIGNED is used so it matches the manual alignment
case, ensuring invalid use will not compile on x86 only to
fail on everything else.

Signed-off-by: Mans Rullgard <mans at mansr.com>

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

 libavcodec/dsputil.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index f9c8906..364270b 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -610,7 +610,9 @@ void ff_dsputil_init_dwt(DSPContext *c);
     uint8_t la_##v[sizeof(t s o) + (a)];                \
     t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a)
 
-#define LOCAL_ALIGNED_D(a, t, v, s, o, ...) DECLARE_ALIGNED(a, t, v) s o
+#define LOCAL_ALIGNED_D(a, t, v, s, o, ...)             \
+    DECLARE_ALIGNED(a, t, la_##v) s o;                  \
+    t (*v) o = la_##v
 
 #define LOCAL_ALIGNED(a, t, v, ...) E(LOCAL_ALIGNED_A(a, t, v, __VA_ARGS__,,))
 



More information about the ffmpeg-cvslog mailing list