Rebase against 4d610717bbc21d65e41a29f9fe9ab5f2963cf16d.

patches/mfplat-streaming-support/0008-winegstreamer-Allow-videoconvert-to-parallelize.patch

@@ -1,4 +1,4 @@
-From eba9e414d60a33dfde7e7b978fcdddbaf9bfe5b6 Mon Sep 17 00:00:00 2001
+From c7b306e0f85a0cd5ef1f5c0849edc56483989d7c Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 21 Oct 2020 16:03:21 -0500
 Subject: [PATCH] winegstreamer: Allow videoconvert to parallelize.
@@ -11,19 +11,19 @@ Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
-index 0573c99858b..5df08dc5fd7 100644
+index 2fa87ac611b..2b3cc2633e3 100644
 --- a/dlls/winegstreamer/wg_parser.c
 +++ b/dlls/winegstreamer/wg_parser.c
-@@ -760,6 +760,9 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user)
-         if (!(vconv = create_element("videoconvert", "base")))
+@@ -812,6 +812,9 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user)
+                 || !append_element(parser->container, element, &first, &last))
              goto out;
  
 +        /* Let GStreamer choose a default number of threads. */
 +        gst_util_set_object_arg(G_OBJECT(vconv), "n-threads", "0");
 +
          /* GStreamer outputs RGB video top-down, but DirectShow expects bottom-up. */
-         if (!(flip = create_element("videoflip", "good")))
-             goto out;
+         if (!(element = create_element("videoflip", "good"))
+                 || !append_element(parser->container, element, &first, &last))
 -- 
-2.37.2
+2.39.2
 

staging/upstream-commit

@@ -1 +1 @@
-f512b3c08ccfc9b9c235964002e644e2cbd657cf
+4d610717bbc21d65e41a29f9fe9ab5f2963cf16d