blob: 6b65641169f5ada78446790ce3d92cccbf6d14b2 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
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;
|
