From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Mon, 5 Apr 2010 09:40:24 +0000 (+0000)
Subject: [qedit]
X-Git-Tag: backups/header-work@57446~30^2~109
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=59929a1790e384d4e08ba76b0128c8faa4021737

[qedit]
sync qedit to wine 1.1.42

svn path=/trunk/; revision=46729
---

diff --git a/reactos/dll/directx/qedit/samplegrabber.c b/reactos/dll/directx/qedit/samplegrabber.c
index 1875c51c49e..78a7306e10e 100644
--- a/reactos/dll/directx/qedit/samplegrabber.c
+++ b/reactos/dll/directx/qedit/samplegrabber.c
@@ -854,7 +854,7 @@ SampleGrabber_ISampleGrabber_GetCurrentBuffer(ISampleGrabber *iface, LONG *bufSi
 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 @@ SampleGrabber_IPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **mtypes)
     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;
 }