Fix: mismatch for template matching based OBMC

Merged zhuoyi Lv requested to merge lvzhuoyi/ECM:JVET-Z0061 into master

Fix the mismatch for template matching based OBMC

Edited by Vadim Seregin

Merge request reports