Skip to content
GitLab
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
8ca9765d
Commit
8ca9765d
authored
6 years ago
by
Qt Forward Merge Bot
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia13d887c3e3bf00b6ded5d052384fc5689b816fe
parents
c877776c
dee506f7
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
dist/changes-5.12.1
+68
-0
dist/changes-5.12.1
src/gsttools/qgstreamerplayersession.cpp
+58
-30
src/gsttools/qgstreamerplayersession.cpp
src/gsttools/qgstreamerplayersession_p.h
+2
-1
src/gsttools/qgstreamerplayersession_p.h
src/plugins/android/src/common/qandroidvideooutput.cpp
+14
-7
src/plugins/android/src/common/qandroidvideooutput.cpp
src/plugins/android/src/common/qandroidvideooutput.h
+3
-1
src/plugins/android/src/common/qandroidvideooutput.h
src/qtmultimediaquicktools/qsgvideonode_yuv.cpp
+2
-2
src/qtmultimediaquicktools/qsgvideonode_yuv.cpp
src/qtmultimediaquicktools/shaders/uyvyvideo.frag
+1
-0
src/qtmultimediaquicktools/shaders/uyvyvideo.frag
src/qtmultimediaquicktools/shaders/uyvyvideo_core.frag
+2
-1
src/qtmultimediaquicktools/shaders/uyvyvideo_core.frag
src/qtmultimediaquicktools/shaders/yuyvvideo.frag
+2
-1
src/qtmultimediaquicktools/shaders/yuyvvideo.frag
src/qtmultimediaquicktools/shaders/yuyvvideo_core.frag
+2
-1
src/qtmultimediaquicktools/shaders/yuyvvideo_core.frag
tests/auto/bic/data/QtMultimedia.5.12.0.linux-gcc-amd64.txt
+12035
-0
tests/auto/bic/data/QtMultimedia.5.12.0.linux-gcc-amd64.txt
tests/auto/bic/data/QtMultimediaWidgets.5.12.0.linux-gcc-amd64.txt
+23125
-0
...o/bic/data/QtMultimediaWidgets.5.12.0.linux-gcc-amd64.txt
with
35314 additions
and
44 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