From 8eb26da2bc9f6281be23d14cace07082643c99e2 Mon Sep 17 00:00:00 2001
From: roberta <antoine.robert@interdigital.com>
Date: Fri, 25 Oct 2019 12:50:04 +0200
Subject: [PATCH] fix compilation
---
source/Lib/CommonLib/UnitTools.cpp | 2 +-
source/Lib/EncoderLib/EncCu.cpp | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp
index c132b9816..5efa08436 100644
--- a/source/Lib/CommonLib/UnitTools.cpp
+++ b/source/Lib/CommonLib/UnitTools.cpp
@@ -794,7 +794,7 @@ void PU::getIBCMergeCandidates(const PredictionUnit &pu, MergeCtx& mrgCtx, const
#if !JVET_P0400_REMOVE_SHARED_MERGE_LIST
bool isShared = ((pu.Y().lumaSize().width != pu.shareParentSize.width) || (pu.Y().lumaSize().height != pu.shareParentSize.height));
#endif
- bool bFound = addMergeHMVPCand(cs, mrgCtx, canFastExit, mrgCandIdx, maxNumMergeCandMin1, cnt
+ bool bFound = addMergeHMVPCand(cs, mrgCtx, canFastExit, mrgCandIdx, maxNumMergeCand, cnt
, isAvailableA1, miLeft, isAvailableB1, miAbove
, true
#if !JVET_P0400_REMOVE_SHARED_MERGE_LIST
diff --git a/source/Lib/EncoderLib/EncCu.cpp b/source/Lib/EncoderLib/EncCu.cpp
index 4da0bfd98..618dba0f2 100644
--- a/source/Lib/EncoderLib/EncCu.cpp
+++ b/source/Lib/EncoderLib/EncCu.cpp
@@ -956,7 +956,6 @@ void EncCu::xCompressCU( CodingStructure*& tempCS, CodingStructure*& bestCS, Par
)
{
const CodingUnit& cu = *bestCS->cus.front();
- const PredictionUnit& pu = *cu.firstPU;
#if JVET_P0400_REMOVE_SHARED_MERGE_LIST
bool isIbcSmallBlk = CU::isIBC(cu) && (cu.lwidth() * cu.lheight() <= 16);
--
GitLab