From 566a2bcdfdfde47c7a30877222a4ebd31f74b33c Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Tue, 18 Apr 2023 17:32:53 -0500 Subject: [PATCH] Rebase against 9e99c6f66d236101a084b6a3a24c98b5c8677fe5. --- ...-winegstreamer-Allow-videoconvert-to-parallelize.patch | 8 ++++---- staging/upstream-commit | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/mfplat-streaming-support/0008-winegstreamer-Allow-videoconvert-to-parallelize.patch b/patches/mfplat-streaming-support/0008-winegstreamer-Allow-videoconvert-to-parallelize.patch index 207981a3..2d2b5ed6 100644 --- a/patches/mfplat-streaming-support/0008-winegstreamer-Allow-videoconvert-to-parallelize.patch +++ b/patches/mfplat-streaming-support/0008-winegstreamer-Allow-videoconvert-to-parallelize.patch @@ -1,4 +1,4 @@ -From 4e5fabb55f5ef955074cdab6db875e6d32592c2d Mon Sep 17 00:00:00 2001 +From 612c0266b7a8cec562f82f1a2aaf55cffc15f35e Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 21 Oct 2020 16:03:21 -0500 Subject: [PATCH] winegstreamer: Allow videoconvert to parallelize. @@ -11,12 +11,12 @@ Signed-off-by: Zebediah Figura 1 file changed, 3 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c -index 2fa87ac611b..d2f682df281 100644 +index dfb3da9a4ab..2135dea456b 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c -@@ -812,6 +812,9 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user) +@@ -842,6 +842,9 @@ static bool stream_create_post_processing_elements(struct wg_parser_stream *stre || !append_element(parser->container, element, &first, &last)) - goto out; + return false; + /* Let GStreamer choose a default number of threads. */ + gst_util_set_object_arg(G_OBJECT(element), "n-threads", "0"); diff --git a/staging/upstream-commit b/staging/upstream-commit index 5ee979bd..70794e10 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -4d610717bbc21d65e41a29f9fe9ab5f2963cf16d +9e99c6f66d236101a084b6a3a24c98b5c8677fe5