Rebase against 9909631f23c037e90fe3ef1ccfeebfff2804d7ed.

patches/mfplat-streaming-support/0055-winegstreamer-Add-MFVideoFormat_ARGB32-output-for-th.patch

@@ -1,4 +1,4 @@
-From 56ad22a46d27fdc5313aff459f6334bb0051e21a Mon Sep 17 00:00:00 2001
+From af54761b8536f81831f2813ef0ff9b627dcc5ca4 Mon Sep 17 00:00:00 2001
 From: Nikolay Sivov <nsivov@codeweavers.com>
 Date: Wed, 12 Jan 2022 22:48:35 +0300
 Subject: [PATCH] winegstreamer: Add MFVideoFormat_ARGB32 output for the
@@ -12,10 +12,10 @@ CW-Bug-Id: #19975
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index de6a2c2b232..042c635ae93 100644
+index 00c40dc2f47..7a0f65b4247 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
-@@ -855,7 +855,7 @@ static HRESULT new_media_stream(struct media_source *source,
+@@ -856,7 +856,7 @@ static HRESULT new_media_stream(struct media_source *source,
  static HRESULT media_stream_init_desc(struct media_stream *stream)
  {
      IMFMediaTypeHandler *type_handler = NULL;
@@ -24,14 +24,14 @@ index de6a2c2b232..042c635ae93 100644
      struct wg_format format;
      DWORD type_count = 0;
      unsigned int i;
-@@ -874,6 +874,7 @@ static HRESULT media_stream_init_desc(struct media_stream *stream)
-             &MFVideoFormat_YUY2,
-             &MFVideoFormat_IYUV,
-             &MFVideoFormat_I420,
-+            &MFVideoFormat_ARGB32,
+@@ -875,6 +875,7 @@ static HRESULT media_stream_init_desc(struct media_stream *stream)
+             WG_VIDEO_FORMAT_YV12,
+             WG_VIDEO_FORMAT_YUY2,
+             WG_VIDEO_FORMAT_I420,
++            WG_VIDEO_FORMAT_BGRA,
          };
  
          IMFMediaType *base_type = mf_media_type_from_wg_format(&format);
 -- 
-2.37.2
+2.40.0
 

staging/upstream-commit

@@ -1 +1 @@
-e658a30a917b0403a1e8f7ed86a8fc0138d990a8
+9909631f23c037e90fe3ef1ccfeebfff2804d7ed