Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
98a2689f
Commit
98a2689f
authored
Feb 07, 2022
by
Zebediah Figura
Committed by
Alexandre Julliard
Feb 08, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
strmbase: Get rid of the BaseOutputPinImpl_InitAllocator() helper.
Signed-off-by:
Zebediah Figura
<
zfigura@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
4e610a07
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
8 deletions
+2
-8
strmbase.h
include/wine/strmbase.h
+0
-1
pin.c
libs/strmbase/pin.c
+2
-7
No files found.
include/wine/strmbase.h
View file @
98a2689f
...
@@ -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
);
...
...
libs/strmbase/pin.c
View file @
98a2689f
...
@@ -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
))
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment