In function xGetTemplateCost function, encoder always uses DCT-IF filter in AMVP cost calculation even if the motion comp. filter is different. The fix would look like:

#if BUGFIX

InterpFilterType ePFilt = (InterpFilterType)pcCU->getSlice()->getInterpFilterType();
switch ( ePFilt )

{

case IPF_TEN_DIF:

xPredInterLumaBlk_TEN ( pcCU, pcPicYuvRef, uiPartAddr, &cMvCand, iSizeX, iSizeY, pcTemplateCand );

break;

default:

xPredInterLumaBlk ( pcCU, pcPicYuvRef, uiPartAddr, &cMvCand, iSizeX, iSizeY, pcTemplateCand );

}

#else

xPredInterLumaBlk ( pcCU, pcPicYuvRef, uiPartAddr, &cMvCand, iSizeX, iSizeY, pcTemplateCand );

#endif