diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2017-01-26 15:40:30 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2017-01-26 15:53:44 +0100 |
| commit | c5ff5b853b9bca231c54ee07e5238714c0407595 (patch) | |
| tree | 0a4d842e7fcb6079d7c7b4935843eb1ba46a4422 /src/plugins/directshow/helpers/directshowmediatype.h | |
| parent | 7e48870c182e66a8408bbcb4c9469d751a777daa (diff) | |
| parent | c1164f874a21959d03893f62db8f8e2def44122d (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
examples/multimediawidgets/videographicsitem/videoplayer.h
src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
Change-Id: Id5ce05ffe2cd25657232157b162680b2e24a35ba
Diffstat (limited to 'src/plugins/directshow/helpers/directshowmediatype.h')
0 files changed, 0 insertions, 0 deletions