This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 064600585ed6f745ee38746822264206b295144c Author: Niklas Haas <[email protected]> AuthorDate: Sat Apr 4 19:43:31 2026 +0200 Commit: Niklas Haas <[email protected]> CommitDate: Fri May 15 18:53:05 2026 +0200 swscale/ops_chain: remove flexible from SWS_OP_MIN/MAX entries We have other op types that skip checking the data even in non-flexible mode, so there is a precedent for just leaving away `flexible` for such kernels. Signed-off-by: Niklas Haas <[email protected]> --- libswscale/ops_chain.c | 3 +-- libswscale/ops_tmpl_common.c | 2 -- libswscale/x86/ops.c | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/libswscale/ops_chain.c b/libswscale/ops_chain.c index f229bdb3ff..afafa64cbc 100644 --- a/libswscale/ops_chain.c +++ b/libswscale/ops_chain.c @@ -159,8 +159,7 @@ static int op_match(const SwsOp *op, const SwsOpEntry *entry) return op->dither.size_log2 == entry->dither_size ? score : 0; case SWS_OP_MIN: case SWS_OP_MAX: - av_assert1(entry->flexible); - break; + return score; case SWS_OP_LINEAR: if (op->lin.mask != entry->linear_mask) return 0; diff --git a/libswscale/ops_tmpl_common.c b/libswscale/ops_tmpl_common.c index a97f031cdb..0d056ca08e 100644 --- a/libswscale/ops_tmpl_common.c +++ b/libswscale/ops_tmpl_common.c @@ -138,13 +138,11 @@ DECL_PATTERN(max) WRAP_COMMON_PATTERNS(min, .op = SWS_OP_MIN, .setup = ff_sws_setup_clamp, - .flexible = true, ); WRAP_COMMON_PATTERNS(max, .op = SWS_OP_MAX, .setup = ff_sws_setup_clamp, - .flexible = true, ); DECL_PATTERN(scale) diff --git a/libswscale/x86/ops.c b/libswscale/x86/ops.c index 4ae5a14d27..dd014b49ec 100644 --- a/libswscale/x86/ops.c +++ b/libswscale/x86/ops.c @@ -186,13 +186,11 @@ static int setup_shift(const SwsImplParams *params, SwsImplResult *out) DECL_COMMON_PATTERNS(F32, min##EXT, \ .op = SWS_OP_MIN, \ .setup = ff_sws_setup_clamp, \ - .flexible = true, \ ); \ \ DECL_COMMON_PATTERNS(F32, max##EXT, \ .op = SWS_OP_MAX, \ .setup = ff_sws_setup_clamp, \ - .flexible = true, \ ); #define DECL_SCALE(EXT) \ _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
