summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorMatthew Lazarow <[email protected]>2017-12-26 00:16:43 +0100
committerSven Gothel <[email protected]>2017-12-26 00:16:43 +0100
commit7f954d7882e3d481906d59bab4838a3002a423bd (patch)
tree6c62f559ce734ed49d0591f3aa03ef1f318e904f /gtk
parent4fd6c5c0085c9aeb566e89c675cf29173cc690f4 (diff)
Initial nvenc h264/hevc encoder patch
Diffstat (limited to 'gtk')
-rw-r--r--gtk/src/callbacks.c2
-rw-r--r--gtk/src/makedeps.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 9c5a2e893..fef5deeab 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -5483,6 +5483,8 @@ format_vquality_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
case HB_VCODEC_FFMPEG_MPEG2:
case HB_VCODEC_FFMPEG_VP8:
case HB_VCODEC_FFMPEG_VP9:
+ case HB_VCODEC_H264_NVENC:
+ case HB_VCODEC_HEVC_NVENC:
case HB_VCODEC_THEORA:
{
return g_strdup_printf("%s: %d", vqname, (int)val);
diff --git a/gtk/src/makedeps.py b/gtk/src/makedeps.py
index 4dae9d0e0..4c5cc5188 100644
--- a/gtk/src/makedeps.py
+++ b/gtk/src/makedeps.py
@@ -59,8 +59,8 @@ dep_map = (
DepEntry("VideoEncoder", "x264FastDecode", "x264|x264_10bit", False, True),
DepEntry("VideoEncoder", "x264UseAdvancedOptions", "x264|x264_10bit", False, True),
DepEntry("HideAdvancedVideoSettings", "x264UseAdvancedOptions", "1", True, True),
- DepEntry("VideoEncoder", "VideoOptionExtraWindow", "x264|x264_10bit|x265|x265_10bit|x265_12bit|x265_16bit|mpeg4|mpeg2|VP8|VP9", False, True),
- DepEntry("VideoEncoder", "VideoOptionExtraLabel", "x264|x264_10bit|x265|x265_10bit|x265_12bit|x265_16bit|mpeg4|mpeg2|VP8|VP9", False, True),
+ DepEntry("VideoEncoder", "VideoOptionExtraWindow", "x264|x264_10bit|x265|x265_10bit|x265_12bit|x265_16bit|mpeg4|mpeg2|VP8|VP9|h264_nvenc|hevc_nvenc", False, True),
+ DepEntry("VideoEncoder", "VideoOptionExtraLabel", "x264|x264_10bit|x265|x265_10bit|x265_12bit|x265_16bit|mpeg4|mpeg2|VP8|VP9|h264_nvenc|hevc_nvenc", False, True),
DepEntry("x264UseAdvancedOptions", "VideoSettingsTable", "1", True, False),
DepEntry("VideoEncoder", "x264_box", "x264|x264_10bit", False, True),
DepEntry("x264UseAdvancedOptions", "x264_box", "0", True, False),