fix issue 61

source/Lib/DecoderLib/DecCu.cpp

@@ -4375,6 +4375,12 @@ void DecCu::xDeriveCUMV(CodingUnit &cu)
             else
             {
               PU::getInterMergeCandidates(pu, mrgCtx, 0, pu.mergeIdx);
+#if JVET_AG0276_LIC_FLAG_SIGNALING
+              if (pu.mergeOppositeLic)
+              {
+                mrgCtx.licFlags[pu.mergeIdx] = !mrgCtx.licFlags[pu.mergeIdx];
+              }
+#endif
             }
 #else
             PU::getInterMergeCandidates(pu, mrgCtx, 0, pu.mergeIdx);

source/Lib/EncoderLib/EncCu.cpp

@@ -5239,13 +5239,13 @@ void EncCu::xCheckRDCostMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&
           m_pcInterSearch->adjustAffineMergeCandidates(pu, affineBMMergeCtx);
         }
 #endif
-#if JVET_AG0276_LIC_FLAG_SIGNALING
-        if (hasOppositelicAff && pu.cs->sps->getUseAffMergeOppositeLic())
-        {
-          affineMergeCtxOppositeLic.numValidMergeCand = slice.getPicHeader()->getMaxNumAffineOppositeLicMergeCand();
-          affineMergeCtxOppositeLic.maxNumMergeCand = slice.getPicHeader()->getMaxNumAffineOppositeLicMergeCand();
-        }
+      }
 #endif
+#if JVET_AG0276_LIC_FLAG_SIGNALING
+      if (hasOppositelicAff && pu.cs->sps->getUseAffMergeOppositeLic())
+      {
+        affineMergeCtxOppositeLic.numValidMergeCand = slice.getPicHeader()->getMaxNumAffineOppositeLicMergeCand();
+        affineMergeCtxOppositeLic.maxNumMergeCand = slice.getPicHeader()->getMaxNumAffineOppositeLicMergeCand();
       }
 #endif
 #if JVET_AD0182_AFFINE_DMVR_PLUS_EXTENSIONS