From 6cb22eeb0cdf3ba7a0fb29d5336071f21b1e7915 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 10 May 2019 18:56:48 +0000 Subject: multimedia/x265: backport some SVTHEVC fixes --- multimedia/x265/files/patch-source_encoder_api.cpp | 45 ---------------------- 1 file changed, 45 deletions(-) delete mode 100644 multimedia/x265/files/patch-source_encoder_api.cpp (limited to 'multimedia/x265/files/patch-source_encoder_api.cpp') diff --git a/multimedia/x265/files/patch-source_encoder_api.cpp b/multimedia/x265/files/patch-source_encoder_api.cpp deleted file mode 100644 index 6b65641169f5..000000000000 --- a/multimedia/x265/files/patch-source_encoder_api.cpp +++ /dev/null @@ -1,45 +0,0 @@ -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; -- cgit v1.2.3