summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodeo <[email protected]>2015-06-08 18:30:54 +0000
committerRodeo <[email protected]>2015-06-08 18:30:54 +0000
commit77de6688d9fce5d41fcc71c59fa30366074a3248 (patch)
tree80323e51369c0e76a5fb039d8798d69716db571a
parentcae4fdb4391fbb5634ba04a8e7196ead9d889fcb (diff)
[merge] encx265: fix regression introduced in SVN revision 6366.
Unknown options and bad values were never fatal for any libhb encoder. git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.10.x@7279 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--libhb/encx265.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/libhb/encx265.c b/libhb/encx265.c
index a3e3fc679..378f55471 100644
--- a/libhb/encx265.c
+++ b/libhb/encx265.c
@@ -188,11 +188,8 @@ int encx265Init(hb_work_object_t *w, hb_job_t *job)
while ((entry = hb_dict_next(x265_opts, entry)) != NULL)
{
// here's where the strings are passed to libx265 for parsing
- if (param_parse(param, entry->key, entry->value))
- {
- hb_dict_free(&x265_opts);
- goto fail;
- }
+ // unknown options or bad values are non-fatal, see encx264.c
+ param_parse(param, entry->key, entry->value);
}
hb_dict_free(&x265_opts);