diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-12-07 23:03:01 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-12-11 11:59:15 +0000 |
| commit | 02823f6d7188260dabb10c64d6dd74331e7772e0 (patch) | |
| tree | 507b4b7e90d7ccef5ef89a5339bef01a2dc20633 /libavcodec/dsputil.h | |
| parent | 395c3feb3bb165af5760d287a9a64344b6269fe2 (diff) | |
| download | ffmpeg-02823f6d7188260dabb10c64d6dd74331e7772e0.tar.gz | |
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@mansr.com>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index f9c89069d5..364270b0b3 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__,,)) |