wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 70d77a439ab58dcf56664d1545aa0c4cd3edb31e.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2020-11-07 11:30:52 +11:00
parent 9d2a93164f
commit c32fb530b8
3 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
patches/mfplat-streaming-support/0032-winegstreamer-Implement-IMFMedisStream-GetMediaSourc.patch
View File

@ -1,34 +0,0 @@
From aa81e4fb72199d511ceed830a447c34ba04bc989 Mon Sep 17 00:00:00 2001
From: Derek Lesho <dlesho@codeweavers.com>
Date: Thu, 2 Apr 2020 15:46:25 -0500
Subject: [PATCH] winegstreamer: Implement IMFMedisStream::GetMediaSource.
---
dlls/winegstreamer/media_source.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
index f372e178b68..46b290d040c 100644
--- a/dlls/winegstreamer/media_source.c
+++ b/dlls/winegstreamer/media_source.c
@@ -714,12 +714,15 @@ static HRESULT WINAPI media_stream_GetMediaSource(IMFMediaStream *iface, IMFMedi
{
struct media_stream *stream = impl_from_IMFMediaStream(iface);
- FIXME("stub (%p)->(%p)\n", stream, source);
+ TRACE("(%p)->(%p)\n", stream, source);
if (stream->state == STREAM_SHUTDOWN)
return MF_E_SHUTDOWN;
- return E_NOTIMPL;
+ IMFMediaSource_AddRef(&stream->parent_source->IMFMediaSource_iface);
+ *source = &stream->parent_source->IMFMediaSource_iface;
+
+ return S_OK;
}
static HRESULT WINAPI media_stream_GetStreamDescriptor(IMFMediaStream* iface, IMFStreamDescriptor **descriptor)
--
2.28.0

3
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "4919b9b99fe20cfb8599b7b827811fdd7937ea9d"
echo "70d77a439ab58dcf56664d1545aa0c4cd3edb31e"
}
# Show version information
@ -2850,7 +2850,6 @@ if test "$enable_mfplat_streaming_support" -eq 1; then
patch_apply mfplat-streaming-support/0029-Miscellaneous.patch
patch_apply mfplat-streaming-support/0030-WMV.patch
patch_apply mfplat-streaming-support/0031-mf-Ask-for-more-samples-from-upstream-node-when-upon.patch
patch_apply mfplat-streaming-support/0032-winegstreamer-Implement-IMFMedisStream-GetMediaSourc.patch
patch_apply mfplat-streaming-support/0033-Expose-PCM-output-type-on-AAC-decoder.patch
patch_apply mfplat-streaming-support/0035-winegstreamer-Implement-Color-Converter-MFT.patch
patch_apply mfplat-streaming-support/0036-HACK-Set-BPS-to-16-for-output-template.patch

2
staging/upstream-commit
View File

@ -1 +1 @@
4919b9b99fe20cfb8599b7b827811fdd7937ea9d
70d77a439ab58dcf56664d1545aa0c4cd3edb31e