diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-27 20:23:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-27 20:23:52 +0200 |
| commit | da7d462e315fb101fc9112a294b5ca2e3bd35a75 (patch) | |
| tree | 843917c14a566949318d1e8e03aa84a6ccc041d4 /src/plugins/directshow/player/directshowiosource.h | |
| parent | 820205e604a5f281238c23464638fdff72b969d1 (diff) | |
| parent | 6d95682d7ff282180655f2f384d8aba69c4f67af (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I639d42e78a2b85e939c9f8e9dd5da70cdc058857
Diffstat (limited to 'src/plugins/directshow/player/directshowiosource.h')
| -rw-r--r-- | src/plugins/directshow/player/directshowiosource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/directshow/player/directshowiosource.h b/src/plugins/directshow/player/directshowiosource.h index 225cfc1ab..3d5cd4dd7 100644 --- a/src/plugins/directshow/player/directshowiosource.h +++ b/src/plugins/directshow/player/directshowiosource.h @@ -125,7 +125,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; |