diff options
| author | Rodeo <[email protected]> | 2015-02-15 19:00:13 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2015-02-15 19:00:13 +0000 |
| commit | 316fa996d4971201b2dfc429af5bab6173931000 (patch) | |
| tree | 4c3c7d8e2a5bc318b76cca222815bc53a992ac91 /libhb/common.c | |
| parent | 635878ad4aa4434faffd39215e65703b2677daf1 (diff) | |
[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
Diffstat (limited to 'libhb/common.c')
| -rw-r--r-- | libhb/common.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |