In TEncSearch.cpp between line 1493 and 1494, as well as between line 7039 and 7040, the following three lines need to be added:

#if HHI_MRG

m_pcEntropyCoder->encodeMergeInfo( pcCU, 0, true );

#endif

This fixes the issue, that an incorrect bitrate is estimated for RD-decisions.

In TEncEntropy.cpp between line 382 and 383, the following needs to be added:

if ( pcCU->getSlice()->isIntra() )
{

return;

}

This avoids the encoding of unwanted merge flags.

In TEncEntropy.cpp between line 900 and 901, the following needs to be added:

if( bRD )

uiAbsPartIdx = 0;

This corrects a wrong determination of merge candidates during the estimation process.

All line numbers are valid for version 0.6.