Zebediah Figura : qedit/samplegrabber: Don't overwrite the filter media type in sample_grabber_sink_connect().
Alexandre Julliard
julliard at winehq.org
Mon Feb 10 16:32:44 CST 2020
Module: wine
Branch: master
Commit: a5f547420f9d180edff961c15b69474cb111860b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5f547420f9d180edff961c15b69474cb111860b
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Fri Feb 7 23:51:52 2020 -0600
qedit/samplegrabber: Don't overwrite the filter media type in sample_grabber_sink_connect().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/qedit/samplegrabber.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c
index f0fa70708a..322cbf0400 100644
--- a/dlls/qedit/samplegrabber.c
+++ b/dlls/qedit/samplegrabber.c
@@ -254,7 +254,7 @@ SampleGrabber_ISampleGrabber_GetConnectedMediaType(ISampleGrabber *iface, AM_MED
if (!filter->sink.pin.peer)
return VFW_E_NOT_CONNECTED;
- CopyMediaType(mt, &filter->filter_mt);
+ CopyMediaType(mt, &filter->sink.pin.mt);
return S_OK;
}
@@ -519,9 +519,6 @@ static HRESULT sample_grabber_sink_connect(struct strmbase_sink *iface,
&& !IsEqualGUID(&filter->filter_mt.formattype, &mt->formattype))
return VFW_E_TYPE_NOT_ACCEPTED;
- FreeMediaType(&filter->filter_mt);
- CopyMediaType(&filter->filter_mt, mt);
-
return S_OK;
}
More information about the wine-cvs
mailing list