[cwittich] 46729: [qedit] sync qedit to wine 1.1.42

Author: cwittich
Date: Mon Apr  5 11:40:24 2010
New Revision: 46729

URL: http://svn.reactos.org/svn/reactos?rev=46729&view=rev
Log:
[qedit]
sync qedit to wine 1.1.42

Modified:
    trunk/reactos/dll/directx/qedit/samplegrabber.c

Modified: trunk/reactos/dll/directx/qedit/samplegrabber.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/samplegra...
==============================================================================
--- trunk/reactos/dll/directx/qedit/samplegrabber.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/qedit/samplegrabber.c [iso-8859-1] Mon Apr  5 11:40:24 2010
@@ -854,7 +854,7 @@
 static HRESULT WINAPI
 SampleGrabber_ISampleGrabber_GetCurrentSample(ISampleGrabber *iface, IMediaSample **sample)
 {
-    /* MS doesn't implement it either, noone should call it */
+    /* MS doesn't implement it either, no one should call it */
     WARN("(%p): not implemented\n", sample);
     return E_NOTIMPL;
 }
@@ -1264,7 +1264,7 @@
     TRACE("(%p)->(%p)\n", This, mtypes);
     if (!mtypes)
         return E_POINTER;
-    *mtypes = mediaenum_create(This->sg->pin_in.pair ? &This->sg->mtype : (const AM_MEDIA_TYPE *)NULL);
+    *mtypes = mediaenum_create(This->sg->pin_in.pair ? &This->sg->mtype : NULL);
     return *mtypes ? S_OK : E_OUTOFMEMORY;
 }