diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2016-09-01 12:29:35 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2016-09-01 12:29:35 +0200 |
| commit | 9fb4597d5c0d3fa3340ae74ed2eb6bb8e3ee2d17 (patch) | |
| tree | cc82491fc856e3d184b3b00727a06139d73c550b /src/plugins/wasapi | |
| parent | 29232a2bc207fb7dc44532f64bbe35d9181340c6 (diff) | |
| parent | da7d462e315fb101fc9112a294b5ca2e3bd35a75 (diff) | |
| download | qtmultimedia-9fb4597d5c0d3fa3340ae74ed2eb6bb8e3ee2d17.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/multimedia/audio/qaudiosystemplugin.cpp
src/plugins/directshow/helpers/directshowobject.cpp
src/plugins/directshow/player/directshowiosource.cpp
src/plugins/directshow/player/directshowiosource.h
Change-Id: I0e4632c7705128f81429ddbcb0d4abbc04858a8b
Diffstat (limited to 'src/plugins/wasapi')
0 files changed, 0 insertions, 0 deletions