This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit 8cc6b2ddafe184cf544a0a10a954570740e94912
Author:     Niklas Haas <[email protected]>
AuthorDate: Fri Jun 19 16:30:28 2026 +0200
Commit:     Niklas Haas <[email protected]>
CommitDate: Sat Jun 20 03:08:33 2026 +0200

    swscale/tests/swscale: fix unscaled subsampled chroma format check
    
    This should be matching against the *chroma* scaler, not the main scaler.
    Of course, under normal circumstances, scaler_sub matches scaler, but this
    allows users to explicitly override this defaulting by setting e.g.
    
    -scaler none -scaler_sub bicubic
    
    Sponsored-by: Sovereign Tech Fund
    Signed-off-by: Niklas Haas <[email protected]>
---
 libswscale/tests/swscale.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libswscale/tests/swscale.c b/libswscale/tests/swscale.c
index b5b8faeeff..6de9327ba9 100644
--- a/libswscale/tests/swscale.c
+++ b/libswscale/tests/swscale.c
@@ -691,8 +691,9 @@ static inline int fmt_is_supported_by_hw(enum AVPixelFormat 
fmt)
 
 static inline int fmt_disabled(const struct options *opts, enum AVPixelFormat 
fmt)
 {
+    const int scaler_sub = opts->scaler_sub ? opts->scaler_sub : opts->scaler;
     return (hw_device_constr && !fmt_is_supported_by_hw(fmt)) ||
-           (opts->scaler < 0 && fmt_is_subsampled(fmt));
+           (scaler_sub < 0 && fmt_is_subsampled(fmt));
 }
 
 static inline int test_formats(const struct options *opts,

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to