Rebase against bedfb9cae224a369efa4588332a5518dbee57035.

This commit is contained in:
Alistair Leslie-Hughes
2020-11-21 09:56:05 +11:00
parent 7734f7a808
commit 88ffa8d374
4 changed files with 21 additions and 21 deletions

View File

@@ -1,7 +1,7 @@
From e7999e5e011156c517ca17d284ed10473b584890 Mon Sep 17 00:00:00 2001
From dabbfa4c200fc70b497bed6a79840531e1ace2b0 Mon Sep 17 00:00:00 2001
From: Derek Lesho <dlesho@codeweavers.com>
Date: Wed, 14 Oct 2020 11:07:34 -0500
Subject: [PATCH 44/45] HACK: Shutdown media sinks on session shutdown.
Subject: [PATCH] HACK: Shutdown media sinks on session shutdown.
TODO: We should be doing this through IMFActivate.
---
@@ -9,18 +9,18 @@ TODO: We should be doing this through IMFActivate.
1 file changed, 5 insertions(+)
diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index 2f1b589a1aa..6fce432da72 100644
index fa6ed13db0c..ae5a600109c 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -1637,6 +1637,7 @@ static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface)
@@ -1845,6 +1845,7 @@ static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface)
static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface)
{
struct media_session *session = impl_from_IMFMediaSession(iface);
+ struct media_sink *sink;
HRESULT hr = S_OK;
FIXME("%p.\n", iface);
@@ -1648,6 +1649,10 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface)
TRACE("%p.\n", iface);
@@ -1856,6 +1857,10 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface)
IMFMediaEventQueue_Shutdown(session->event_queue);
if (session->quality_manager)
IMFQualityManager_Shutdown(session->quality_manager);
@@ -28,9 +28,9 @@ index 2f1b589a1aa..6fce432da72 100644
+ {
+ IMFMediaSink_Shutdown(sink->sink);
+ }
}
LeaveCriticalSection(&session->cs);
MFShutdownObject((IUnknown *)session->clock);
IMFPresentationClock_Release(session->clock);
session->clock = NULL;
--
2.28.0
2.29.2