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 <[email protected]>
nanoscopic · Dec 11, 2012 · 02823f6 · 02823f6
1 parent 395c3fe
commit 02823f6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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__,,))