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
11b90699
Commit
11b90699
authored
6 years ago
by
Qt Forward Merge Bot
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I3a41fab753e5a06fc9f30464edf7d6626e7ae92a
parents
ad4d8d0f
c1ca9510
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/gsttools/qgstcodecsinfo.cpp
+1
-1
src/gsttools/qgstcodecsinfo.cpp
src/plugins/gstreamer/camerabin/camerabinsession.cpp
+22
-10
src/plugins/gstreamer/camerabin/camerabinsession.cpp
with
23 additions
and
11 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