This changes the LOCAL_ALIGNED definition on systems where DECLARE_ALIGNED is used such 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]> --- libavcodec/dsputil.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 5640f3a..c1bd401 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__,,)) -- 1.8.0 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
