Commit 98a2689f authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

strmbase: Get rid of the BaseOutputPinImpl_InitAllocator() helper.

parent 4e610a07
...@@ -105,7 +105,6 @@ struct strmbase_sink_ops ...@@ -105,7 +105,6 @@ struct strmbase_sink_ops
}; };
/* Base Pin */ /* Base Pin */
HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *pin, IMemAllocator **allocator);
HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *pin, IMemInputPin *peer, IMemAllocator **allocator); HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *pin, IMemInputPin *peer, IMemAllocator **allocator);
HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *pin, IPin *peer, const AM_MEDIA_TYPE *mt); HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *pin, IPin *peer, const AM_MEDIA_TYPE *mt);
......
...@@ -677,11 +677,6 @@ static const IPinVtbl source_vtbl = ...@@ -677,11 +677,6 @@ static const IPinVtbl source_vtbl =
source_NewSegment, source_NewSegment,
}; };
HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *This, IMemAllocator **pMemAlloc)
{
return CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)pMemAlloc);
}
HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *This, HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *This,
IMemInputPin *pPin, IMemAllocator **pAlloc) IMemInputPin *pPin, IMemAllocator **pAlloc)
{ {
...@@ -690,8 +685,8 @@ HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *This, ...@@ -690,8 +685,8 @@ HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *This,
hr = IMemInputPin_GetAllocator(pPin, pAlloc); hr = IMemInputPin_GetAllocator(pPin, pAlloc);
if (hr == VFW_E_NO_ALLOCATOR) if (hr == VFW_E_NO_ALLOCATOR)
/* Input pin provides no allocator, use standard memory allocator */ hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL,
hr = BaseOutputPinImpl_InitAllocator(This, pAlloc); CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)pAlloc);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment