From 4025a05c64100b13615f856ac0b403b3623a5cf4 Mon Sep 17 00:00:00 2001 From: Christian Stromme Date: Fri, 12 Aug 2016 14:24:49 +0200 Subject: DirectShow: Restore negotiation of sample type in the io filter This functionality was removed in d44a327da4a956f62cc0d51, but is still needed, as we need to negotiate the media type with the input pin; even if we limit the scope to streaming types. Task-number: QTBUG-55264 Change-Id: I7cc02c5ea17cca9912c29c40813314b04b91bd18 Reviewed-by: Yoann Lopes --- src/plugins/directshow/player/directshowiosource.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/directshow/player/directshowiosource.h') diff --git a/src/plugins/directshow/player/directshowiosource.h b/src/plugins/directshow/player/directshowiosource.h index f5e8ec6d1..60300ba18 100644 --- a/src/plugins/directshow/player/directshowiosource.h +++ b/src/plugins/directshow/player/directshowiosource.h @@ -119,7 +119,7 @@ private: IReferenceClock *m_clock; IMemAllocator *m_allocator; IPin *m_peerPin; - DirectShowMediaType m_outputType; + DirectShowMediaType m_connectionMediaType; QString m_filterName; const QString m_pinId; bool m_queriedForAsyncReader; -- cgit v1.2.3