Commit eeddb204 authored by Karsten Suehring's avatar Karsten Suehring

compile fixes for BMS with JEM_TOOLS macro disabled

parent e8252d31
......@@ -1506,8 +1506,12 @@ void PU::getInterMergeCandidates( const PredictionUnit &pu, MergeCtx& mrgCtx, co
{
if( mrgCtx.interDirNeighbours[ i ] == dir &&
mrgCtx.mvFieldNeighbours [ i << 1 ] == mrgCtx.mvFieldNeighbours[ uiArrayAddr << 1 ] &&
#if JEM_TOOLS
mrgCtx.mvFieldNeighbours [( i << 1 ) + 1] == mrgCtx.mvFieldNeighbours[( uiArrayAddr << 1 ) + 1] &&
mrgCtx.LICFlags[i] == LICFlag )
#else
mrgCtx.mvFieldNeighbours [( i << 1 ) + 1] == mrgCtx.mvFieldNeighbours[( uiArrayAddr << 1 ) + 1] )
#endif
{
addTMvp = false;
}
......
......@@ -1377,7 +1377,7 @@ Void IntraSearch::xEncSubdivCbfQT(CodingStructure &cs, Partitioner &partitioner,
{
const UnitArea &currArea = partitioner.currArea();
TransformUnit &currTU = *cs.getTU( currArea.blocks[partitioner.chType], partitioner.chType );
#if HEVC_USE_RQT || HM_EMT_NSST_AS_IN_JEM
#if HEVC_USE_RQT || (JEM_TOOLS && HM_EMT_NSST_AS_IN_JEM)
CodingUnit &currCU = *currTU.cu;
#endif
#if HEVC_USE_RQT || ENABLE_CHROMA_422
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment