diff options
| author | Zhao Zhili <zhilizhao@tencent.com> | 2024-11-15 18:56:27 +0800 |
|---|---|---|
| committer | Zhao Zhili <zhilizhao@tencent.com> | 2024-11-29 12:33:03 +0800 |
| commit | 59057aa807c4ee14d158ce6b55ecfa69f3541aea (patch) | |
| tree | eb0ceb81ae6c221c2d1a1be46ed0ab52a62a32b5 /libavutil/mem_internal.h | |
| parent | 57861911a34e1c33796be97f2b2f44e05fffd647 (diff) | |
| download | ffmpeg-59057aa807c4ee14d158ce6b55ecfa69f3541aea.tar.gz | |
avutil/mem_internal: local align should always work
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
Diffstat (limited to 'libavutil/mem_internal.h')
| -rw-r--r-- | libavutil/mem_internal.h | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/libavutil/mem_internal.h b/libavutil/mem_internal.h index 49262abf4b..249ec3a642 100644 --- a/libavutil/mem_internal.h +++ b/libavutil/mem_internal.h @@ -111,38 +111,18 @@ // to be forced to tokenize __VA_ARGS__ #define E1(x) x -#define LOCAL_ALIGNED_A(a, t, v, s, o, ...) \ - 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, la_##v) s o; \ t (*v) o = la_##v #define LOCAL_ALIGNED(a, t, v, ...) LOCAL_ALIGNED_##a(t, v, __VA_ARGS__) -#if HAVE_LOCAL_ALIGNED -# define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_D(4, t, v, __VA_ARGS__,,)) -#else -# define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_A(4, t, v, __VA_ARGS__,,)) -#endif +#define LOCAL_ALIGNED_4(t, v, ...) E1(LOCAL_ALIGNED_D(4, t, v, __VA_ARGS__,,)) -#if HAVE_LOCAL_ALIGNED -# define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,)) -#else -# define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_A(8, t, v, __VA_ARGS__,,)) -#endif +#define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,)) -#if HAVE_LOCAL_ALIGNED -# define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,)) -#else -# define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_A(16, t, v, __VA_ARGS__,,)) -#endif +#define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,)) -#if HAVE_LOCAL_ALIGNED -# define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_D(32, t, v, __VA_ARGS__,,)) -#else -# define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_A(32, t, v, __VA_ARGS__,,)) -#endif +#define LOCAL_ALIGNED_32(t, v, ...) E1(LOCAL_ALIGNED_D(32, t, v, __VA_ARGS__,,)) #endif /* AVUTIL_MEM_INTERNAL_H */ |