This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 91f4552d9f633ad341659208ee4752ffa0f2cdb5 Author: Ramiro Polla <[email protected]> AuthorDate: Mon Jul 6 15:36:51 2026 +0200 Commit: Ramiro Polla <[email protected]> CommitDate: Thu Jul 16 08:30:30 2026 +0000 swscale/aarch64/ops: move SwsOpExec/SwsOpImpl offset value checks to ops.c This prevents build warnings for ops_asmgen on non-aarch64 hosts. Sponsored-by: Sovereign Tech Fund Signed-off-by: Ramiro Polla <[email protected]> --- libswscale/aarch64/ops.c | 14 ++++++++++++++ libswscale/aarch64/ops_impl.h | 13 ++----------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/libswscale/aarch64/ops.c b/libswscale/aarch64/ops.c index 71137f7bea..ab2adc37eb 100644 --- a/libswscale/aarch64/ops.c +++ b/libswscale/aarch64/ops.c @@ -28,6 +28,20 @@ #include "ops_impl_conv.c" +/** + * Check that there is no mismatch for the SwsOpExec/SwsOpImpl offset + * values used by ops_asmgen. + * NOTE: The check is performed here since this file only ever targets + * aarch64, differently from ops_asmgen which may be built on any + * host. + */ +static_assert(offsetof_exec_in == offsetof(SwsOpExec, in), "SwsOpExec layout mismatch"); +static_assert(offsetof_exec_out == offsetof(SwsOpExec, out), "SwsOpExec layout mismatch"); +static_assert(offsetof_exec_in_bump == offsetof(SwsOpExec, in_bump), "SwsOpExec layout mismatch"); +static_assert(offsetof_exec_out_bump == offsetof(SwsOpExec, out_bump), "SwsOpExec layout mismatch"); +static_assert(offsetof_impl_cont == offsetof(SwsOpImpl, cont), "SwsOpImpl layout mismatch"); +static_assert(offsetof_impl_priv == offsetof(SwsOpImpl, priv), "SwsOpImpl layout mismatch"); + /*********************************************************************/ static int aarch64_setup_linear(const SwsAArch64OpImplParams *p, const SwsOp *op, SwsImplResult *res) diff --git a/libswscale/aarch64/ops_impl.h b/libswscale/aarch64/ops_impl.h index 9ccacc60e7..9950ccdad8 100644 --- a/libswscale/aarch64/ops_impl.h +++ b/libswscale/aarch64/ops_impl.h @@ -163,8 +163,8 @@ static inline int linear_index_to_vx(int idx) /** * These values will be used by ops_asmgen to access fields inside of - * SwsOpExec and SwsOpImpl. The sizes are checked below when compiling - * for AArch64 to make sure there is no mismatch. + * SwsOpExec and SwsOpImpl. The sizes are checked in aarch64/ops.c when + * compiling for AArch64 to make sure there is no mismatch. */ #define offsetof_exec_in 0 #define offsetof_exec_out 32 @@ -174,13 +174,4 @@ static inline int linear_index_to_vx(int idx) #define offsetof_impl_priv 16 #define sizeof_impl 32 -#if ARCH_AARCH64 && HAVE_NEON -static_assert(offsetof_exec_in == offsetof(SwsOpExec, in), "SwsOpExec layout mismatch"); -static_assert(offsetof_exec_out == offsetof(SwsOpExec, out), "SwsOpExec layout mismatch"); -static_assert(offsetof_exec_in_bump == offsetof(SwsOpExec, in_bump), "SwsOpExec layout mismatch"); -static_assert(offsetof_exec_out_bump == offsetof(SwsOpExec, out_bump), "SwsOpExec layout mismatch"); -static_assert(offsetof_impl_cont == offsetof(SwsOpImpl, cont), "SwsOpImpl layout mismatch"); -static_assert(offsetof_impl_priv == offsetof(SwsOpImpl, priv), "SwsOpImpl layout mismatch"); -#endif - #endif /* SWSCALE_AARCH64_OPS_IMPL_H */ _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
