Author: akhaldi
Date: Sun Mar 1 22:47:11 2015
New Revision: 66533
URL:
http://svn.reactos.org/svn/reactos?rev=66533&view=rev
Log:
[QEDIT] Sync with Wine Staging 1.7.37. CORE-9246
Modified:
trunk/reactos/dll/directx/wine/qedit/mediadet.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/directx/wine/qedit/mediadet.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/med…
==============================================================================
--- trunk/reactos/dll/directx/wine/qedit/mediadet.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/qedit/mediadet.c [iso-8859-1] Sun Mar 1 22:47:11 2015
@@ -648,7 +648,6 @@
obj->cur_pin = NULL;
obj->num_streams = -1;
obj->cur_stream = 0;
- *ppv = obj;
if (pUnkOuter)
obj->outer_unk = pUnkOuter;
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 1 22:47:11 2015
@@ -45,7 +45,7 @@
reactos/dll/directx/wine/dxdiagn # Synced to Wine-1.7.27
reactos/dll/directx/wine/dxgi # Synced to WineStaging-1.7.37
reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.37
-reactos/dll/directx/wine/qedit # Synced to Wine-1.7.27
+reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.37
reactos/dll/directx/wine/quartz # Synced to Wine-1.7.27
reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.37