From 5691abee01b8ec8e44350c47e2ef59a59f91f01d Mon Sep 17 00:00:00 2001
From: zhipin <zhipin.deng@bytedance.com>
Date: Thu, 11 Jun 2020 14:26:58 +0800
Subject: [PATCH] fix linux compiling issue
---
source/Lib/CommonLib/Slice.cpp | 2 ++
source/Lib/DecoderLib/DecLib.cpp | 7 +++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index bc523aa16..1beb97392 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -660,6 +660,7 @@ void Slice::checkRPL(const ReferencePictureList* pRPL0, const ReferencePictureLi
bool fieldSeqFlag = getSPS()->getFieldSeqFlag();
+#if !JVET_R0041
int currentPictureIsTrailing = 0;
if (getPic()->getDecodingOrderNumber() > associatedIRAPDecodingOrderNumber)
{
@@ -677,6 +678,7 @@ void Slice::checkRPL(const ReferencePictureList* pRPL0, const ReferencePictureLi
currentPictureIsTrailing = 1;
}
}
+#endif
for (int i = 0; i < numEntriesL0; i++)
{
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index b987325e0..2ffa214f3 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -393,16 +393,15 @@ DecLib::DecLib()
, m_isFirstGeneralHrd(true)
, m_prevGeneralHrdParams()
#if JVET_R0041
+ , m_PrevGDRInSameLayerPOC{ 0 }
+ , m_pocCRA{ 0 }
, m_associatedIRAPDecodingOrderNumber{ 0 }
#else
, m_associatedIRAPType(NAL_UNIT_INVALID)
, m_associatedIRAPDecodingOrderNumber(0)
#endif
, m_decodingOrderCounter(0)
-#if JVET_R0041
- , m_PrevGDRInSameLayerPOC{ 0 }
- , m_pocCRA{ 0 }
-#else
+#if !JVET_R0041
, m_pocCRA(0)
#endif
, m_pocRandomAccess(MAX_INT)
--
GitLab