Merge branch 'Fix_related_to_AF0163' into 'master'

Fix: Variable initialization moved before loop related to JVET-AF0163

See merge request ecm/ECM!559

source/Lib/CommonLib/InterPrediction.cpp

@@ -6548,9 +6548,11 @@ void InterPrediction::xPredAffineTpl(const PredictionUnit &pu, const RefPicList
     int iMvScaleTmpVer0Above = iMvScaleVer + ((iDMvHorY * blockWidth) >> 1);
     int iMvScaleTmpHor0Left = iMvScaleHor + ((iDMvVerX * blockHeight) >> 1);
     int iMvScaleTmpVer0Left = iMvScaleVer + ((iDMvVerY * blockHeight) >> 1);
+    int iMvScaleTmpHorLeft, iMvScaleTmpVerLeft, iMvScaleTmpHorAbove, iMvScaleTmpVerAbove;
 #else
     int iMvScaleTmpHor0 = iMvScaleHor + ((iDMvHorX * blockWidth + iDMvVerX * blockHeight) >> 1);
     int iMvScaleTmpVer0 = iMvScaleVer + ((iDMvHorY * blockWidth + iDMvVerY * blockHeight) >> 1);
+    int iMvScaleTmpHor, iMvScaleTmpVer;
 #endif
 #if JVET_AD0140_MVD_PREDICTION
@@ -6579,12 +6581,6 @@ void InterPrediction::xPredAffineTpl(const PredictionUnit &pu, const RefPicList
       {
         if (w == 0 || h == 0)
         {
-#if JVET_AF0163_TM_SUBBLOCK_REFINEMENT
-          int iMvScaleTmpHorLeft, iMvScaleTmpVerLeft, iMvScaleTmpHorAbove, iMvScaleTmpVerAbove;
-#else
-          int iMvScaleTmpHor, iMvScaleTmpVer;
-#endif
-
 #if !AFFINE_RM_CONSTRAINTS_AND_OPT
           if (!subblkMVSpreadOverLimit)
 #endif