Commit c131e067 authored by Karsten Suehring's avatar Karsten Suehring

correction of previous commit

parent 857ae7c1
......@@ -1470,8 +1470,8 @@ void PU::getInterMergeCandidates( const PredictionUnit &pu, MergeCtx& mrgCtx, co
if( dir != 0 )
{
bool addTMvp = !( cs.sps->getSpsNext().getUseSubPuMvp() && isAvailableSubPu );
#if JEM_TOOLS
bool addTMvp = !( cs.sps->getSpsNext().getUseSubPuMvp() && isAvailableSubPu );
if( !addTMvp )
{
if( dir != mrgCtx.interDirNeighbours[subPuMvpPos] || LICFlag != mrgCtx.LICFlags[subPuMvpPos] )
......@@ -1493,6 +1493,8 @@ void PU::getInterMergeCandidates( const PredictionUnit &pu, MergeCtx& mrgCtx, co
}
}
}
#else
bool addTMvp = true;
#endif
#if HM_JEM_MERGE_CANDS
#if JEM_TOOLS
......
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