diff options
| author | Nomis101 <[email protected]> | 2019-11-29 21:28:26 +0100 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2019-12-09 22:42:56 -0500 |
| commit | 15488668bc372f8d4b1d01811ea238a3803619fb (patch) | |
| tree | 8efd8ddff5daf6acd86183cdf7cb0dd26e9d520c | |
| parent | 3856784971bfb3c7485a79cce0853b846159150e (diff) | |
x265: Fix pass 2 encode failure
This fixes a 2-pass encoding failure which also does affect HandBrake, see https://bitbucket.org/multicoreware/x265/issues/524/2-pass-encoding-failure-with-32-15
(cherry picked from commit 23b07d0a4857c9d279388da319b1582e0bcbb889)
| -rw-r--r-- | contrib/x265/A02-2pass_fix.patch | 19 | ||||
| -rw-r--r-- | contrib/x265_10bit/A02-2pass_fix.patch | 19 | ||||
| -rw-r--r-- | contrib/x265_12bit/A02-2pass_fix.patch | 19 | ||||
| -rw-r--r-- | contrib/x265_8bit/A02-2pass_fix.patch | 19 |
4 files changed, 76 insertions, 0 deletions
diff --git a/contrib/x265/A02-2pass_fix.patch b/contrib/x265/A02-2pass_fix.patch new file mode 100644 index 000000000..2e5f53933 --- /dev/null +++ b/contrib/x265/A02-2pass_fix.patch @@ -0,0 +1,19 @@ +# HG changeset patch +# User Niranjan <[email protected]> +# Date 1574665937 -19800 +# Node ID f0fe46ce379dbdf21ee255146796dbf5c4e02ac7 +# Parent 4a29e0c5bfaf30aaed2c5224bcba1f464d68de83 +Fix pass 2 encode failure (Issue #524) + +diff --git a/source/encoder/ratecontrol.cpp b/source/encoder/ratecontrol.cpp +--- a/source/encoder/ratecontrol.cpp ++++ b/source/encoder/ratecontrol.cpp +@@ -53,7 +53,7 @@ + {\ + bErr = 0;\ + p = strstr(opts, opt "=");\ +- char* q = strstr(opts, "no-" opt);\ ++ char* q = strstr(opts, "no-" opt " ");\ + if (p && sscanf(p, opt "=%d" , &i) && param_val != i)\ + bErr = 1;\ + else if (!param_val && !q && !p)\ diff --git a/contrib/x265_10bit/A02-2pass_fix.patch b/contrib/x265_10bit/A02-2pass_fix.patch new file mode 100644 index 000000000..2e5f53933 --- /dev/null +++ b/contrib/x265_10bit/A02-2pass_fix.patch @@ -0,0 +1,19 @@ +# HG changeset patch +# User Niranjan <[email protected]> +# Date 1574665937 -19800 +# Node ID f0fe46ce379dbdf21ee255146796dbf5c4e02ac7 +# Parent 4a29e0c5bfaf30aaed2c5224bcba1f464d68de83 +Fix pass 2 encode failure (Issue #524) + +diff --git a/source/encoder/ratecontrol.cpp b/source/encoder/ratecontrol.cpp +--- a/source/encoder/ratecontrol.cpp ++++ b/source/encoder/ratecontrol.cpp +@@ -53,7 +53,7 @@ + {\ + bErr = 0;\ + p = strstr(opts, opt "=");\ +- char* q = strstr(opts, "no-" opt);\ ++ char* q = strstr(opts, "no-" opt " ");\ + if (p && sscanf(p, opt "=%d" , &i) && param_val != i)\ + bErr = 1;\ + else if (!param_val && !q && !p)\ diff --git a/contrib/x265_12bit/A02-2pass_fix.patch b/contrib/x265_12bit/A02-2pass_fix.patch new file mode 100644 index 000000000..2e5f53933 --- /dev/null +++ b/contrib/x265_12bit/A02-2pass_fix.patch @@ -0,0 +1,19 @@ +# HG changeset patch +# User Niranjan <[email protected]> +# Date 1574665937 -19800 +# Node ID f0fe46ce379dbdf21ee255146796dbf5c4e02ac7 +# Parent 4a29e0c5bfaf30aaed2c5224bcba1f464d68de83 +Fix pass 2 encode failure (Issue #524) + +diff --git a/source/encoder/ratecontrol.cpp b/source/encoder/ratecontrol.cpp +--- a/source/encoder/ratecontrol.cpp ++++ b/source/encoder/ratecontrol.cpp +@@ -53,7 +53,7 @@ + {\ + bErr = 0;\ + p = strstr(opts, opt "=");\ +- char* q = strstr(opts, "no-" opt);\ ++ char* q = strstr(opts, "no-" opt " ");\ + if (p && sscanf(p, opt "=%d" , &i) && param_val != i)\ + bErr = 1;\ + else if (!param_val && !q && !p)\ diff --git a/contrib/x265_8bit/A02-2pass_fix.patch b/contrib/x265_8bit/A02-2pass_fix.patch new file mode 100644 index 000000000..2e5f53933 --- /dev/null +++ b/contrib/x265_8bit/A02-2pass_fix.patch @@ -0,0 +1,19 @@ +# HG changeset patch +# User Niranjan <[email protected]> +# Date 1574665937 -19800 +# Node ID f0fe46ce379dbdf21ee255146796dbf5c4e02ac7 +# Parent 4a29e0c5bfaf30aaed2c5224bcba1f464d68de83 +Fix pass 2 encode failure (Issue #524) + +diff --git a/source/encoder/ratecontrol.cpp b/source/encoder/ratecontrol.cpp +--- a/source/encoder/ratecontrol.cpp ++++ b/source/encoder/ratecontrol.cpp +@@ -53,7 +53,7 @@ + {\ + bErr = 0;\ + p = strstr(opts, opt "=");\ +- char* q = strstr(opts, "no-" opt);\ ++ char* q = strstr(opts, "no-" opt " ");\ + if (p && sscanf(p, opt "=%d" , &i) && param_val != i)\ + bErr = 1;\ + else if (!param_val && !q && !p)\ |