Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtMultimedia
Commits
cb1871d0
Commit
cb1871d0
authored
11 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I469f258c4838f87edaedc8620d925a3c537d1619
parents
48a6a8a0
a2f078f1
dev
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
5.3
5.4
5.5
5.6
5.7
5.8
5.9
5.9.8
6.2
6.2.0
6.2.1
6.2.2
old/5.2
wip/cmake
wip/qt6
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
v5.5.1
v5.5.0
v5.5.0-rc1
v5.5.0-beta1
v5.5.0-alpha1
v5.4.2
v5.4.1
v5.4.0
v5.4.0-rc1
v5.4.0-beta1
v5.4.0-alpha1
v5.3.2
v5.3.1
v5.3.0
v5.3.0-rc1
v5.3.0-beta1
v5.3.0-alpha1
v5.2.1
v5.2.0
v5.2.0-rc1
v5.2.0-beta1
v5.2.0-alpha1
No related merge requests found
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
dist/changes-5.1.1
+45
-0
dist/changes-5.1.1
examples/multimedia/video/qmlvideofx/main.cpp
+3
-11
examples/multimedia/video/qmlvideofx/main.cpp
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
+7
-2
...ultimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
src/gsttools/qvideosurfacegstsink.cpp
+3
-2
src/gsttools/qvideosurfacegstsink.cpp
src/multimedia/audio/qsoundeffect_qaudio_p.cpp
+1
-1
src/multimedia/audio/qsoundeffect_qaudio_p.cpp
src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java
+1
-1
...tproject/qt5/android/multimedia/QtAndroidMediaPlayer.java
src/plugins/android/mediaplayer/qandroidmediaplayercontrol.cpp
+6
-7
...lugins/android/mediaplayer/qandroidmediaplayercontrol.cpp
src/plugins/android/wrappers/jsurfacetexture.cpp
+2
-2
src/plugins/android/wrappers/jsurfacetexture.cpp
src/plugins/wmf/evrcustompresenter.cpp
+3
-2
src/plugins/wmf/evrcustompresenter.cpp
src/plugins/wmf/evrd3dpresentengine.cpp
+15
-3
src/plugins/wmf/evrd3dpresentengine.cpp
src/plugins/wmf/mftvideo.cpp
+3
-2
src/plugins/wmf/mftvideo.cpp
src/plugins/wmf/player/mfplayersession.cpp
+7
-7
src/plugins/wmf/player/mfplayersession.cpp
src/plugins/wmf/player/mfvideorenderercontrol.cpp
+19
-5
src/plugins/wmf/player/mfvideorenderercontrol.cpp
with
115 additions
and
45 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets