Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 21:36:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qedit]

Browse source 
sync qedit to wine 1.1.42

svn path=/trunk/; revision=46729
This commit is contained in:
Christoph von Wittich 2010-04-05 09:40:24 +00:00
parent c174a972b4
commit 59929a1790
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/directx/qedit/samplegrabber.c
View file

@ -854,7 +854,7 @@ SampleGrabber_ISampleGrabber_GetCurrentBuffer(ISampleGrabber *iface, LONG *bufSi
static HRESULT WINAPI static HRESULT WINAPI
SampleGrabber_ISampleGrabber_GetCurrentSample(ISampleGrabber *iface, IMediaSample **sample) 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); WARN("(%p): not implemented\n", sample);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -1264,7 +1264,7 @@ SampleGrabber_IPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **mtypes)
TRACE("(%p)->(%p)\n", This, mtypes); TRACE("(%p)->(%p)\n", This, mtypes);
if (!mtypes) if (!mtypes)
return E_POINTER; 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; return *mtypes ? S_OK : E_OUTOFMEMORY;
} }