Commit 6a82b9e8b9 for ffmpeg
commit 6a82b9e8b9056fe4d60e0c663c48ce0fe375794f
Author: Niklas Haas <git@haasn.dev>
Date: Sat Nov 7 13:48:13 2026 +0100
swscale/aarch64/ops: add alignof_impl and FFALIGN
Used in the next commit.
Signed-off-by: Niklas Haas <git@haasn.dev>
diff --git a/libswscale/aarch64/ops.c b/libswscale/aarch64/ops.c
index 599b39d1a5..6dfc20b420 100644
--- a/libswscale/aarch64/ops.c
+++ b/libswscale/aarch64/ops.c
@@ -40,6 +40,7 @@ static_assert(offsetof_exec_out_bump == offsetof(SwsOpExec, out_bump), "SwsOpExe
static_assert(offsetof_impl_func == offsetof(SwsOpImpl, func), "SwsOpImpl layout mismatch");
static_assert(offsetof_impl_priv == offsetof(SwsOpImpl, priv), "SwsOpImpl layout mismatch");
static_assert(sizeof_impl == sizeof(SwsOpImpl), "SwsOpImpl layout mismatch");
+static_assert(alignof_impl == alignof(SwsOpImpl), "SwsOpImpl layout mismatch");
/*********************************************************************/
/* Forward-declare exported functions. */
diff --git a/libswscale/aarch64/ops_impl.h b/libswscale/aarch64/ops_impl.h
index b8b952a1f6..ddd0c56bb4 100644
--- a/libswscale/aarch64/ops_impl.h
+++ b/libswscale/aarch64/ops_impl.h
@@ -94,5 +94,6 @@ static inline int linear_num_vregs(const SwsAArch64OpImplParams *params)
#define offsetof_impl_func 0
#define offsetof_impl_priv 8
#define sizeof_impl 24
+#define alignof_impl 8
#endif /* SWSCALE_AARCH64_OPS_IMPL_H */
diff --git a/libswscale/aarch64/ops_static.c b/libswscale/aarch64/ops_static.c
index 62a0a42bdc..f090e4e099 100644
--- a/libswscale/aarch64/ops_static.c
+++ b/libswscale/aarch64/ops_static.c
@@ -58,6 +58,7 @@
#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
+#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
static void av_freep(void *ptr)
{