This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit cac183f46f16beecf994c1dc7365ee5edb3c4f4d Author: Niklas Haas <[email protected]> AuthorDate: Wed Apr 22 16:10:09 2026 +0200 Commit: Niklas Haas <[email protected]> CommitDate: Fri May 15 18:53:05 2026 +0200 swscale/ops: don't silently suppress non-ENOTSUP errors Matches the behavior to the comment. Signed-off-by: Niklas Haas <[email protected]> --- libswscale/ops.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libswscale/ops.c b/libswscale/ops.c index 36e2c6cd5a..a030dc5e57 100644 --- a/libswscale/ops.c +++ b/libswscale/ops.c @@ -1025,12 +1025,13 @@ static int enum_ops_fmt(SwsContext *ctx, void *opaque, ops->src.height = ops->dst.height = 16; bool incomplete = ff_infer_colors(&ops->src.color, &ops->dst.color); - if (ff_sws_decode_pixfmt(ops, src_fmt) < 0 || - ff_sws_decode_colors(ctx, type, ops, &ops->src, &incomplete) < 0 || - ff_sws_encode_colors(ctx, type, ops, &ops->src, &ops->dst, &incomplete) < 0 || - ff_sws_encode_pixfmt(ops, dst_fmt) < 0) + if ((ret = ff_sws_decode_pixfmt(ops, src_fmt)) < 0 || + (ret = ff_sws_decode_colors(ctx, type, ops, &ops->src, &incomplete)) < 0 || + (ret = ff_sws_encode_colors(ctx, type, ops, &ops->src, &ops->dst, &incomplete)) < 0 || + (ret = ff_sws_encode_pixfmt(ops, dst_fmt)) < 0) { - ret = 0; /* silently skip unsupported formats */ + if (ret == AVERROR(ENOTSUP)) + ret = 0; /* silently skip unsupported formats */ goto fail; } _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
