Skip to content

W
wine-cw
Commit a6bf7bb0 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

qcap: Just use the driver_info pointer from the parent.

parent dc75b34d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
dlls/qcap/vfwcapture.c
View file @ a6bf7bb0
...@@ -103,7 +103,6 @@ static inline VfwCapture *impl_from_IPersistPropertyBag(IPersistPropertyBag *ifa ...@@ -103,7 +103,6 @@ static inline VfwCapture *impl_from_IPersistPropertyBag(IPersistPropertyBag *ifa
typedef struct VfwPinImpl typedef struct VfwPinImpl
{ {
BaseOutputPin pin; BaseOutputPin pin;
Capture *driver_info;
VfwCapture *parent; VfwCapture *parent;
const IKsPropertySetVtbl * KSP_VT; const IKsPropertySetVtbl * KSP_VT;
} VfwPinImpl; } VfwPinImpl;
...@@ -554,7 +553,6 @@ PPB_Load( IPersistPropertyBag * iface, IPropertyBag *pPropBag, ...@@ -554,7 +553,6 @@ PPB_Load( IPersistPropertyBag * iface, IPropertyBag *pPropBag,
if (This->driver_info) if (This->driver_info)
{ {
pin = (VfwPinImpl *)This->pOutputPin; pin = (VfwPinImpl *)This->pOutputPin;
pin->driver_info = This->driver_info;
pin->parent = This; pin->parent = This;
This->init = TRUE; This->init = TRUE;
hr = S_OK; hr = S_OK;
...@@ -683,7 +681,7 @@ static HRESULT WINAPI VfwPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDI ...@@ -683,7 +681,7 @@ static HRESULT WINAPI VfwPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDI
if (iPosition > 0) if (iPosition > 0)
return VFW_S_NO_MORE_ITEMS; 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)) { if (SUCCEEDED(hr)) {
CopyMediaType(pmt, vfw_pmt); CopyMediaType(pmt, vfw_pmt);
DeleteMediaType(vfw_pmt); DeleteMediaType(vfw_pmt);
...@@ -797,7 +795,7 @@ VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) ...@@ -797,7 +795,7 @@ VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum)
HRESULT hr; HRESULT hr;
VfwPinImpl *This = (VfwPinImpl *)iface; 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)) { if (SUCCEEDED(hr)) {
hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); hr = BasePinImpl_EnumMediaTypes(iface, ppEnum);
DeleteMediaType(pmt); DeleteMediaType(pmt);
......
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