Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:13:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[AMSTREAM] Sync with Wine Staging 3.9. CORE-14656

Browse source
This commit is contained in:
Amine Khaldi 2018-05-27 03:50:07 +01:00
parent fcf9cc1ab7
commit a5f73f6c86
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dll/directx/wine/amstream/mediastream.c
View file

@ -20,7 +20,6 @@
#ifndef __REACTOS__ #ifndef __REACTOS__
#define NONAMELESSUNION #define NONAMELESSUNION
#define NONAMELESSSTRUCT
#endif #endif
#define COBJMACROS #define COBJMACROS
@ -505,7 +504,7 @@ static const IPinVtbl DirectDrawMediaStreamInputPin_IPin_Vtbl =
BasePinImpl_QueryPinInfo, BasePinImpl_QueryPinInfo,
BasePinImpl_QueryDirection, BasePinImpl_QueryDirection,
BasePinImpl_QueryId, BasePinImpl_QueryId,
BaseInputPinImpl_QueryAccept, BasePinImpl_QueryAccept,
BasePinImpl_EnumMediaTypes, BasePinImpl_EnumMediaTypes,
BasePinImpl_QueryInternalConnections, BasePinImpl_QueryInternalConnections,
BaseInputPinImpl_EndOfStream, BaseInputPinImpl_EndOfStream,
@ -1074,7 +1073,7 @@ static const IPinVtbl AudioMediaStreamInputPin_IPin_Vtbl =
BasePinImpl_QueryPinInfo, BasePinImpl_QueryPinInfo,
BasePinImpl_QueryDirection, BasePinImpl_QueryDirection,
BasePinImpl_QueryId, BasePinImpl_QueryId,
BaseInputPinImpl_QueryAccept, BasePinImpl_QueryAccept,
BasePinImpl_EnumMediaTypes, BasePinImpl_EnumMediaTypes,
BasePinImpl_QueryInternalConnections, BasePinImpl_QueryInternalConnections,
BaseInputPinImpl_EndOfStream, BaseInputPinImpl_EndOfStream,

2
media/doc/README.WINE
View file

@ -21,7 +21,7 @@ reactos/sdk/tools/wpp # Synced to WineStaging-2.9
The following libraries are shared with Wine. The following libraries are shared with Wine.
reactos/dll/directx/wine/amstream # Synced to WineStaging-3.3 reactos/dll/directx/wine/amstream # Synced to WineStaging-3.9
reactos/dll/directx/wine/d3d8 # Synced to WineStaging-3.3 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-3.3
reactos/dll/directx/wine/d3d9 # Synced to WineStaging-3.3 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-3.3
reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-3.3 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-3.3