From 316fa996d4971201b2dfc429af5bab6173931000 Mon Sep 17 00:00:00 2001 From: Rodeo Date: Sun, 15 Feb 2015 19:00:13 +0000 Subject: [merged] H.265: don't allow requesting Main 10 profile. git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.10.x@6905 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libhb/common.c') diff --git a/libhb/common.c b/libhb/common.c index 99d8f24ab..17dc0d47d 100644 --- a/libhb/common.c +++ b/libhb/common.c @@ -17,6 +17,7 @@ #include "lang.h" #include "common.h" #include "h264_common.h" +#include "h265_common.h" #ifdef USE_QSV #include "qsv_common.h" #endif @@ -1210,10 +1211,9 @@ const char* const* hb_video_encoder_get_profiles(int encoder) case HB_VCODEC_X264: return hb_h264_profile_names; -#ifdef USE_X265 case HB_VCODEC_X265: - return x265_profile_names; -#endif + return hb_h265_profile_names; + default: return NULL; } -- cgit v1.2.3