Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PR] swscale/graph: correctly error out on slice thread init error (PR #22316)
@ 2026-02-27 16:37 Niklas Haas via ffmpeg-devel
  0 siblings, 0 replies; only message in thread
From: Niklas Haas via ffmpeg-devel @ 2026-02-27 16:37 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Niklas Haas

PR #22316 opened by Niklas Haas (haasn)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22316
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22316.patch

The code was evidently designed at one point in time to support "direct"
execution (not via a thread pool) for num_threads == 1, but this was never
implemented.

Just properly error out here.

Signed-off-by: Niklas Haas <git@haasn.dev>


>From de0d1d95c110a7724a3edca8c52e1b68acc8dc12 Mon Sep 17 00:00:00 2001
From: Niklas Haas <git@haasn.dev>
Date: Fri, 27 Feb 2026 13:32:00 +0100
Subject: [PATCH] swscale/graph: correctly error out on slice thread init error

The code was evidently designed at one point in time to support "direct"
execution (not via a thread pool) for num_threads == 1, but this was never
implemented.

Just properly error out here.

Signed-off-by: Niklas Haas <git@haasn.dev>
---
 libswscale/graph.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libswscale/graph.c b/libswscale/graph.c
index 6a17a12496..2eaf7595f4 100644
--- a/libswscale/graph.c
+++ b/libswscale/graph.c
@@ -791,12 +791,9 @@ int ff_sws_graph_create(SwsContext *ctx, const SwsFormat *dst, const SwsFormat *
 
     ret = avpriv_slicethread_create(&graph->slicethread, (void *) graph,
                                     sws_graph_worker, NULL, ctx->threads);
-    if (ret == AVERROR(ENOSYS))
-        graph->num_threads = 1;
-    else if (ret < 0)
+    if (ret < 0)
         goto error;
-    else
-        graph->num_threads = ret;
+    graph->num_threads = ret;
 
     ret = init_passes(graph);
     if (ret < 0)
-- 
2.52.0

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2026-02-27 16:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-02-27 16:37 [FFmpeg-devel] [PR] swscale/graph: correctly error out on slice thread init error (PR #22316) Niklas Haas via ffmpeg-devel

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git