summaryrefslogtreecommitdiff
path: root/multimedia/x265/files/patch-source_encoder_api.cpp
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2019-03-10 17:10:56 +0000
committerJan Beich <jbeich@FreeBSD.org>2019-03-10 17:10:56 +0000
commit71bb197b3aab49b09719d421fb6d759af74e4fb9 (patch)
treebf8ef7458d6c9930be312d5ef66088762504b776 /multimedia/x265/files/patch-source_encoder_api.cpp
parentUpdate to 0.7.1 (diff)
multimedia/x265: update to 3.0
- Add SVTHEVC option, see http://x265.org/x265-svt-hevc-house/ - Drop libmd patch due to rebase churn for what little value it provides Changes: https://x265.readthedocs.io/en/latest/releasenotes.html#version-3-0 PR: 235906 Approved by: maintainer timeout (2 weeks)
Diffstat (limited to 'multimedia/x265/files/patch-source_encoder_api.cpp')
-rw-r--r--multimedia/x265/files/patch-source_encoder_api.cpp45
1 files changed, 45 insertions, 0 deletions
diff --git a/multimedia/x265/files/patch-source_encoder_api.cpp b/multimedia/x265/files/patch-source_encoder_api.cpp
new file mode 100644
index 000000000000..6b65641169f5
--- /dev/null
+++ b/multimedia/x265/files/patch-source_encoder_api.cpp
@@ -0,0 +1,45 @@
+source/encoder/api.cpp:432:17: error: cannot jump from this
+ goto statement to its label
+ goto fail;
+ ^
+source/encoder/api.cpp:436:36: note: jump bypasses variable
+ initialization
+ EB_H265_ENC_CONFIGURATION* svtParam = (EB_H265_ENC_CONFIGURATION*)encoder->m_svtAppData->svtHevcParams;
+ ^
+source/encoder/api.cpp:413:17: error: cannot jump from this
+ goto statement to its label
+ goto fail;
+ ^
+source/encoder/api.cpp:436:36: note: jump bypasses variable
+ initialization
+ EB_H265_ENC_CONFIGURATION* svtParam = (EB_H265_ENC_CONFIGURATION*)encoder->m_svtAppData->svtHevcParams;
+ ^
+source/encoder/api.cpp:406:21: error: cannot jump from this
+ goto statement to its label
+ goto fail;
+ ^
+source/encoder/api.cpp:436:36: note: jump bypasses variable
+ initialization
+ EB_H265_ENC_CONFIGURATION* svtParam = (EB_H265_ENC_CONFIGURATION*)encoder->m_svtAppData->svtHevcParams;
+ ^
+3 errors generated.
+
+--- source/encoder/api.cpp.orig 2019-01-23 09:47:18 UTC
++++ source/encoder/api.cpp
+@@ -355,6 +355,7 @@ int x265_encoder_encode(x265_encoder *enc, x265_nal **
+ static unsigned char picSendDone = 0;
+ numEncoded = 0;
+ static int codedNal = 0, eofReached = 0;
++ EB_H265_ENC_CONFIGURATION* svtParam = NULL;
+
+ if (encoder->m_param->bEnableSvtHevc)
+ {
+@@ -433,7 +434,7 @@ int x265_encoder_encode(x265_encoder *enc, x265_nal **
+ }
+ }
+
+- EB_H265_ENC_CONFIGURATION* svtParam = (EB_H265_ENC_CONFIGURATION*)encoder->m_svtAppData->svtHevcParams;
++ svtParam = (EB_H265_ENC_CONFIGURATION*)encoder->m_svtAppData->svtHevcParams;
+ if (eofReached && svtParam->codeEosNal == 0 && !codedNal)
+ {
+ EB_BUFFERHEADERTYPE *outputStreamPtr = 0;