This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 28fda48e0bf6d9b47d450250f769a58998f0491f Author: Niklas Haas <[email protected]> AuthorDate: Sun Oct 25 17:59:10 2026 +0100 Commit: Niklas Haas <[email protected]> CommitDate: Wed Oct 28 15:32:15 2026 +0000 Revert "swscale/tests/swscale: don't bail on ENOTSUP in auxiliary conversions" This reverts commit 60c8273b35762d6fdd0f70c451cba5a12b2d8e72. No longer needed work-around (see previous commit). Signed-off-by: Niklas Haas <[email protected]> --- libswscale/tests/swscale.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libswscale/tests/swscale.c b/libswscale/tests/swscale.c index 869a24472b..23b41dc729 100644 --- a/libswscale/tests/swscale.c +++ b/libswscale/tests/swscale.c @@ -683,8 +683,11 @@ static int run_test(struct runner *runner, const struct test_case *t, ret = (opts->api == IMPL_LEGACY) ? scale_legacy(dst, src, &t->mode, opts, &r.time) : state.hw_device_ctx ? scale_hw(dst, src, &t->mode, opts, &r.time) : scale_new(runner, dst, src, &t->mode, opts, &r.time); - if (ret < 0) + if (ret < 0) { + if (ret == AVERROR(ENOTSUP)) + ret = 0; goto error; + } ret = init_frame(&out, ref, ref->width, ref->height, ref->format); if (ret < 0) @@ -732,8 +735,6 @@ bad_loss: error: av_frame_free(&dst); av_frame_free(&out); - if (ret == AVERROR(ENOTSUP)) - ret = 0; return ret; } -- 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]
