diff options
| author | Rodeo <[email protected]> | 2015-02-16 21:00:30 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2015-02-16 21:00:30 +0000 |
| commit | ae9996a7898a53090394033625a8906ac0b23c15 (patch) | |
| tree | cd7937e235790b09ca49a2c7aec5a516f1e90cf1 /libhb | |
| parent | a7d5e48cff4a2ae7dce3a1324407467d232d06d8 (diff) | |
[merged] libhb: don't pass "auto" profile to libx265.
git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.10.x@6914 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/encx265.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libhb/encx265.c b/libhb/encx265.c index 50699934d..a3e3fc679 100644 --- a/libhb/encx265.c +++ b/libhb/encx265.c @@ -271,7 +271,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; } |