This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit b120505ce2d5e934451019250af4e846d0ced9c4 Author: Niklas Haas <[email protected]> AuthorDate: Sat Jun 20 02:55:04 2026 +0200 Commit: Niklas Haas <[email protected]> CommitDate: Sat Jun 20 03:02:41 2026 +0200 swscale/ops: apply ff_sws_comp_mask_swizzle() in-place More convenient at every use site. Sponsored-by: Sovereign Tech Fund Signed-off-by: Niklas Haas <[email protected]> --- libswscale/ops.c | 7 ++++--- libswscale/ops.h | 2 +- libswscale/ops_optimizer.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libswscale/ops.c b/libswscale/ops.c index 1ea5261c3d..71f450fc6b 100644 --- a/libswscale/ops.c +++ b/libswscale/ops.c @@ -144,16 +144,17 @@ SwsCompMask ff_sws_comp_mask_q4(const AVRational q[4]) return mask; } -SwsCompMask ff_sws_comp_mask_swizzle(const SwsCompMask mask, const SwsSwizzleOp *swiz) +void ff_sws_comp_mask_swizzle(SwsCompMask *mask, const SwsSwizzleOp *swiz) { + const SwsCompMask orig = *mask; SwsCompMask res = 0; for (int i = 0; i < 4; i++) { const int src = swiz->in[i]; - if (SWS_COMP_TEST(mask, src)) + if (SWS_COMP_TEST(orig, src)) res |= SWS_COMP(i); } - return res; + *mask = res; } SwsCompMask ff_sws_comp_mask_needed(const SwsOp *op) diff --git a/libswscale/ops.h b/libswscale/ops.h index 41755f35f4..b5de7546d5 100644 --- a/libswscale/ops.h +++ b/libswscale/ops.h @@ -146,7 +146,7 @@ typedef struct SwsSwizzleOp { } SwsSwizzleOp; #define SWS_SWIZZLE(X,Y,Z,W) ((SwsSwizzleOp) { .in = {X, Y, Z, W} }) -SwsCompMask ff_sws_comp_mask_swizzle(SwsCompMask mask, const SwsSwizzleOp *swiz); +void ff_sws_comp_mask_swizzle(SwsCompMask *mask, const SwsSwizzleOp *swiz); typedef struct SwsShiftOp { uint8_t amount; /* number of bits to shift */ diff --git a/libswscale/ops_optimizer.c b/libswscale/ops_optimizer.c index e6ebd21515..8c473c1a52 100644 --- a/libswscale/ops_optimizer.c +++ b/libswscale/ops_optimizer.c @@ -61,7 +61,7 @@ static bool op_commute_clear(SwsOp *op, SwsOp *next) op->type = next->filter.type; return true; case SWS_OP_SWIZZLE: - op->clear.mask = ff_sws_comp_mask_swizzle(op->clear.mask, &next->swizzle); + ff_sws_comp_mask_swizzle(&op->clear.mask, &next->swizzle); ff_sws_apply_op_q(next, op->clear.value); return true; case SWS_OP_SWAP_BYTES: _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
