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

Git pushed a commit to branch master
in repository ffmpeg.

commit 2c5f0d5f895f41a01e2069406108c109dd42e17c
Author:     Niklas Haas <[email protected]>
AuthorDate: Sun Oct 25 18:24:29 2026 +0100
Commit:     Niklas Haas <[email protected]>
CommitDate: Wed Oct 28 15:32:15 2026 +0000

    swscale/format: mark XYZ formats as unsupported
    
    Regressed by the introduction of planar XYZ formats, which unintentionally
    exposed XYZ formats as "supported" in libswscale's unstable path, despite 
XYZ
    formats not yet being supported by the new ops code.
    
    This incomplete partial support was then poorly and incorrectly worked
    around by 2ed5830108, a20ae16999 and 60c8273b357. The test framework still
    spams errors as a result of these three incomplete work-arounds.
    
    Rather than pile on a third work-around (e.g. skipping XYZ in the test
    framework), just do the sensible thing and properly disable support for
    formats that are not yet handled correctly by the ops path.
    
    Correct handling will require the introduction of 1D LUTs / TRCs, which
    is a larger change on the roadmap.
    
    Fixes: 2983c23762ab62160ad8b28dff6042d15efabf20
    Signed-off-by: Niklas Haas <[email protected]>
---
 libswscale/format.c         | 4 ++++
 tests/ref/fate/sws-ops-list | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libswscale/format.c b/libswscale/format.c
index 4af9c91b35..0d2a07b5bc 100644
--- a/libswscale/format.c
+++ b/libswscale/format.c
@@ -980,6 +980,10 @@ static int fmt_analyze(enum AVPixelFormat fmt, 
SwsReadWriteOp *rw_op,
     if (desc->log2_chroma_w || desc->log2_chroma_h)
         return AVERROR(ENOTSUP);
 
+    /* XYZ decoding requires TRC support, which is not implemented yet */
+    if (desc->flags & AV_PIX_FMT_FLAG_XYZ)
+        return AVERROR(ENOTSUP);
+
     /* No support for semi-planar formats at the moment */
     if (desc->flags & AV_PIX_FMT_FLAG_PLANAR &&
         av_pix_fmt_count_planes(fmt) < desc->nb_components)
diff --git a/tests/ref/fate/sws-ops-list b/tests/ref/fate/sws-ops-list
index f5519b5e19..89652b8541 100644
--- a/tests/ref/fate/sws-ops-list
+++ b/tests/ref/fate/sws-ops-list
@@ -1 +1 @@
-5e7e06cdc6f4c715b0a7ce5ed278e084
+4e6b06a456afad8365188ff8ff897b79

-- 
To stop receiving notification emails like this one, please contact
[email protected].
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to