You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against f6a5a3d03c1eb914444af96352ca54eec79d7e2c.
This commit is contained in:
@@ -1,30 +0,0 @@
|
||||
From fa2952956340a84140071cd64b194223e2ea1c69 Mon Sep 17 00:00:00 2001
|
||||
From: Derek Lesho <dlesho@codeweavers.com>
|
||||
Date: Wed, 26 Aug 2020 10:23:58 -0500
|
||||
Subject: [PATCH] mf/sar: Compare against native media type in
|
||||
IsMediaTypeSupported.
|
||||
|
||||
TODO: add tests.
|
||||
---
|
||||
dlls/mf/sar.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c
|
||||
index 6f1f1bd834e..547f8eb391c 100644
|
||||
--- a/dlls/mf/sar.c
|
||||
+++ b/dlls/mf/sar.c
|
||||
@@ -1479,8 +1479,9 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_IsMediaTypeSupported(IM
|
||||
TRACE("%p, %p, %p.\n", iface, in_type, out_type);
|
||||
|
||||
EnterCriticalSection(&renderer->cs);
|
||||
- hr = renderer->current_media_type && IMFMediaType_IsEqual(renderer->current_media_type, in_type, &flags) == S_OK ?
|
||||
- S_OK : MF_E_INVALIDMEDIATYPE;
|
||||
+ hr = IMFMediaType_IsEqual(renderer->current_media_type ? renderer->current_media_type : renderer->media_type, in_type, &flags) == S_OK ?
|
||||
+ S_OK : MF_E_INVALIDMEDIATYPE;
|
||||
+
|
||||
LeaveCriticalSection(&renderer->cs);
|
||||
|
||||
return hr;
|
||||
--
|
||||
2.28.0
|
||||
|
Reference in New Issue
Block a user