Rebase against d04a54857cc84f881393e4bc794185650a302084.

[makefiles-Revert_libwine_Import]
Disabled patch, the problem should be fixed in the development branch.
This commit is contained in:
Sebastian Lackner
2016-03-29 02:43:56 +02:00
parent 0a391faaba
commit c43b0d8ac0
7 changed files with 20 additions and 78 deletions

View File

@ -1,39 +0,0 @@
From afaa960b059c2e6bf75635c4e2d96be774ece41a Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 22:45:29 +0100
Subject: quartz: Avoid implicit cast of interface pointer.
---
dlls/quartz/acmwrapper.c | 2 +-
dlls/quartz/avidec.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c
index d9a94a9..3c1c7cf 100644
--- a/dlls/quartz/acmwrapper.c
+++ b/dlls/quartz/acmwrapper.c
@@ -55,7 +55,7 @@ static const IBaseFilterVtbl ACMWrapper_Vtbl;
static inline ACMWrapperImpl *impl_from_TransformFilter( TransformFilter *iface )
{
- return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter);
+ return CONTAINING_RECORD(iface, ACMWrapperImpl, tf);
}
static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample)
diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c
index 1a58844..eb9b223 100644
--- a/dlls/quartz/avidec.c
+++ b/dlls/quartz/avidec.c
@@ -54,7 +54,7 @@ static const IBaseFilterVtbl AVIDec_Vtbl;
static inline AVIDecImpl *impl_from_TransformFilter( TransformFilter *iface )
{
- return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter);
+ return CONTAINING_RECORD(iface, AVIDecImpl, tf);
}
static HRESULT WINAPI AVIDec_StartStreaming(TransformFilter* pTransformFilter)
--
2.7.1