summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodeo <[email protected]>2015-02-16 20:59:53 +0000
committerRodeo <[email protected]>2015-02-16 20:59:53 +0000
commit32f214a3c0fdca8fd8262dada391d02c723bda70 (patch)
tree9e4975d20c5f168d9d82ff8b1432aecb9c5b420c
parentfd2efdba537c5794caef0cd82fc6c60e4f319f74 (diff)
libhb: don't pass "auto" profile to libx265.
This isn't a valid H.265 profile and will cause encoder initialization to fail. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6913 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--libhb/encx265.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libhb/encx265.c b/libhb/encx265.c
index 4e1e3e2c4..d9b4be64e 100644
--- a/libhb/encx265.c
+++ b/libhb/encx265.c
@@ -269,7 +269,9 @@ int encx265Init(hb_work_object_t *w, hb_job_t *job)
}
/* Apply profile and level settings last. */
- if (x265_param_apply_profile(param, job->encoder_profile) < 0)
+ if (job->encoder_profile != NULL &&
+ strcasecmp(job->encoder_profile, hb_h265_profile_names[0]) != 0 &&
+ x265_param_apply_profile(param, job->encoder_profile) < 0)
{
goto fail;
}