Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
a6bf7bb0
Commit
a6bf7bb0
authored
Aug 02, 2015
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Aug 03, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qcap: Just use the driver_info pointer from the parent.
parent
dc75b34d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
vfwcapture.c
dlls/qcap/vfwcapture.c
+2
-4
No files found.
dlls/qcap/vfwcapture.c
View file @
a6bf7bb0
...
...
@@ -103,7 +103,6 @@ static inline VfwCapture *impl_from_IPersistPropertyBag(IPersistPropertyBag *ifa
typedef
struct
VfwPinImpl
{
BaseOutputPin
pin
;
Capture
*
driver_info
;
VfwCapture
*
parent
;
const
IKsPropertySetVtbl
*
KSP_VT
;
}
VfwPinImpl
;
...
...
@@ -554,7 +553,6 @@ PPB_Load( IPersistPropertyBag * iface, IPropertyBag *pPropBag,
if
(
This
->
driver_info
)
{
pin
=
(
VfwPinImpl
*
)
This
->
pOutputPin
;
pin
->
driver_info
=
This
->
driver_info
;
pin
->
parent
=
This
;
This
->
init
=
TRUE
;
hr
=
S_OK
;
...
...
@@ -683,7 +681,7 @@ static HRESULT WINAPI VfwPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDI
if
(
iPosition
>
0
)
return
VFW_S_NO_MORE_ITEMS
;
hr
=
qcap_driver_get_format
(
This
->
driver_info
,
&
vfw_pmt
);
hr
=
qcap_driver_get_format
(
This
->
parent
->
driver_info
,
&
vfw_pmt
);
if
(
SUCCEEDED
(
hr
))
{
CopyMediaType
(
pmt
,
vfw_pmt
);
DeleteMediaType
(
vfw_pmt
);
...
...
@@ -797,7 +795,7 @@ VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum)
HRESULT
hr
;
VfwPinImpl
*
This
=
(
VfwPinImpl
*
)
iface
;
hr
=
qcap_driver_get_format
(
This
->
driver_info
,
&
pmt
);
hr
=
qcap_driver_get_format
(
This
->
parent
->
driver_info
,
&
pmt
);
if
(
SUCCEEDED
(
hr
))
{
hr
=
BasePinImpl_EnumMediaTypes
(
iface
,
ppEnum
);
DeleteMediaType
(
pmt
);
...
...
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