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

Git pushed a commit to branch master
in repository ffmpeg.

commit 45e62bf036001e26101e18a8e1d1d8c018e1541a
Author:     Kacper Michajłow <[email protected]>
AuthorDate: Sun Oct 25 07:33:16 2026 +0100
Commit:     Kacper Michajłow <[email protected]>
CommitDate: Wed Oct 28 19:22:28 2026 +0000

    avcodec/libjxlenc: fail when the color encoding cannot be set
    
    Signed-off-by: Kacper Michajłow <[email protected]>
---
 libavcodec/libjxlenc.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c
index c8c864d266..0852ece70e 100644
--- a/libavcodec/libjxlenc.c
+++ b/libavcodec/libjxlenc.c
@@ -510,8 +510,11 @@ static int libjxl_preprocess_stream(AVCodecContext *avctx, 
const AVFrame *frame,
     }
 
     /* jret != JXL_ENC_SUCCESS means fallthrough from above */
-    if (!sd || !sd->size || jret != JXL_ENC_SUCCESS)
-        libjxl_populate_colorspace(avctx, frame, pix_desc, &info);
+    if (!sd || !sd->size || jret != JXL_ENC_SUCCESS) {
+        ret = libjxl_populate_colorspace(avctx, frame, pix_desc, &info);
+        if (ret < 0)
+            goto end;
+    }
 
 #if JPEGXL_NUMERIC_VERSION >= JPEGXL_COMPUTE_NUMERIC_VERSION(0, 8, 0)
     jret = JxlEncoderSetFrameBitDepth(ctx->options, &jxl_bit_depth);

-- 
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