Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
stitchEm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Franco (nextime) Lanza
stitchEm
Commits
600fa497
Unverified
Commit
600fa497
authored
4 years ago
by
Wieland Morgenstern
Committed by
GitHub
4 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #95 from stitchEm/w-m/studio-disable-nvenc
Disable NVENC output in Studio
parents
93a48ba8
307afe18
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
CHANGELOG.md
CHANGELOG.md
+7
-0
videoprocess.cpp
...-studio-gui/src/centralwidget/processtab/videoprocess.cpp
+5
-0
No files found.
CHANGELOG.md
0 → 100644
View file @
600fa497
### Current master
*
disabled unsupported NVENC output options in VideoStitch Studio (#88)
### v2.4.0 (2020-05-03)
*
initial binary release
This diff is collapsed.
Click to expand it.
apps/src/videostitch-studio-gui/src/centralwidget/processtab/videoprocess.cpp
View file @
600fa497
...
...
@@ -108,6 +108,11 @@ void VideoProcess::updateSupportedCodecs() {
ui
->
comboCodec
->
clear
();
QStringList
codecs
=
currentFormat
->
getSupportedCodecs
();
codecs
.
removeOne
(
VideoStitch
::
VideoCodec
::
getStringFromEnum
(
VideoStitch
::
VideoCodec
::
VideoCodecEnum
::
MPEG4
));
// TODO: not implemented in Studio (CodecFactory, formats/codecs)
codecs
.
removeOne
(
VideoStitch
::
VideoCodec
::
getStringFromEnum
(
VideoStitch
::
VideoCodec
::
VideoCodecEnum
::
NVENC_H264
));
codecs
.
removeOne
(
VideoStitch
::
VideoCodec
::
getStringFromEnum
(
VideoStitch
::
VideoCodec
::
VideoCodecEnum
::
NVENC_HEVC
));
for
(
const
QString
&
data
:
codecs
)
{
const
VideoStitch
::
VideoCodec
::
VideoCodecEnum
codec
=
VideoStitch
::
VideoCodec
::
getEnumFromString
(
data
);
ui
->
comboCodec
->
addItem
(
VideoStitch
::
VideoCodec
::
getDisplayNameFromEnum
(
codec
),
data
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment