summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/player/directshowiosource.h
diff options
context:
space:
mode:
authorChristian Stromme <christian.stromme@theqtcompany.com>2016-08-12 14:24:49 +0200
committerChristian Stromme <christian.stromme@qt.io>2016-08-23 13:27:01 +0000
commit4025a05c64100b13615f856ac0b403b3623a5cf4 (patch)
treec1d8c5d986bdfac49d2c363755603e72acb36ca6 /src/plugins/directshow/player/directshowiosource.h
parent0ce67605de8e71f0607b36e2ef28801c3fc5c655 (diff)
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 <yoann.lopes@qt.io>
Diffstat (limited to 'src/plugins/directshow/player/directshowiosource.h')
-rw-r--r--src/plugins/directshow/player/directshowiosource.h2
1 files changed, 1 insertions, 1 deletions
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;