https://git.reactos.org/?p=reactos.git;a=commitdiff;h=928bad849bd6e7bfb7568d1ac050eb332b9f58b9
commit 928bad849bd6e7bfb7568d1ac050eb332b9f58b9 Author: Amine Khaldi <[email protected]> AuthorDate: Sun Jan 21 22:11:24 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sun Jan 21 22:11:24 2018 +0100 [AMSTREAM] Sync with Wine 3.0. CORE-14225 --- dll/directx/wine/amstream/mediastreamfilter.c | 2 +- media/doc/README.WINE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/directx/wine/amstream/mediastreamfilter.c b/dll/directx/wine/amstream/mediastreamfilter.c index 0ba9a7033b..39c3a5eddb 100644 --- a/dll/directx/wine/amstream/mediastreamfilter.c +++ b/dll/directx/wine/amstream/mediastreamfilter.c @@ -58,7 +58,7 @@ typedef struct { static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) { - return CONTAINING_RECORD((IBaseFilter *)iface, IMediaStreamFilterImpl, filter.IBaseFilter_iface); + return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, filter); } static HRESULT WINAPI BasePinImpl_CheckMediaType(BasePin *This, const AM_MEDIA_TYPE *pmt) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index f1703a5bed..5077043221 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -21,7 +21,7 @@ reactos/sdk/tools/wpp # Synced to WineStaging-2.9 The following libraries are shared with Wine. -reactos/dll/directx/wine/amstream # Synced to WineStaging-2.9 +reactos/dll/directx/wine/amstream # Synced to Wine-3.0 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-2.16 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-2.16 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-2.16
