summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2015-10-12 13:44:11 -0700
committerJohn Stebbins <[email protected]>2015-11-12 10:06:30 -0800
commit2c9d144740e0133cdf389ec814626439700b64f7 (patch)
treee6d847dd82bbaa02e618e34745b13b4eeeab7a83 /gtk
parent02585c6faf9163a1b1bab9ce537afb7044dc35f6 (diff)
x265: add support for 10, 12, and 16 bit x265 libs
automatically pull in shared versions of these libs or allow statically building against any one of them.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/src/hb-backend.c5
-rw-r--r--gtk/src/makedeps.py4
2 files changed, 6 insertions, 3 deletions
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 9b26552d0..afae9d4da 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -999,7 +999,10 @@ ghb_vquality_default(signal_user_data_t *ud)
switch (vcodec)
{
- case HB_VCODEC_X265:
+ case HB_VCODEC_X265_8BIT:
+ case HB_VCODEC_X265_10BIT:
+ case HB_VCODEC_X265_12BIT:
+ case HB_VCODEC_X265_16BIT:
case HB_VCODEC_X264_8BIT:
case HB_VCODEC_X264_10BIT:
return 20;
diff --git a/gtk/src/makedeps.py b/gtk/src/makedeps.py
index 8abc4cc9d..a0277e840 100644
--- a/gtk/src/makedeps.py
+++ b/gtk/src/makedeps.py
@@ -56,8 +56,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|mpeg4|mpeg2|VP8", False, True),
- DepEntry("VideoEncoder", "VideoOptionExtraLabel", "x264|x264_10bit|x265|mpeg4|mpeg2|VP8", False, True),
+ DepEntry("VideoEncoder", "VideoOptionExtraWindow", "x264|x264_10bit|x265|x265_10bit|x265_12bit|x265_16bit|mpeg4|mpeg2|VP8", False, True),
+ DepEntry("VideoEncoder", "VideoOptionExtraLabel", "x264|x264_10bit|x265|x265_10bit|x265_12bit|x265_16bit|mpeg4|mpeg2|VP8", False, True),
DepEntry("x264UseAdvancedOptions", "VideoSettingsTable", "1", True, False),
DepEntry("VideoEncoder", "x264_box", "x264|x264_10bit", False, True),
DepEntry("x264UseAdvancedOptions", "x264_box", "0", True, False),