Merge branch 'JVET-M0246-fix' into 'master'

rename obsolete macro BD_AFFINE_AMVR to JVET_M0246_AFFINE_AMVR See merge request jvet/VVCSoftware_VTM!211

Merge branch 'JVET-M0246-fix' into 'master'
50ab2508 · Frank Bossen · b60fc212 · f4f8f115 · 50ab2508
Commit 50ab2508 authored 6 years ago by Frank Bossen
--- a/source/Lib/CommonLib/Contexts.cpp
+++ b/source/Lib/CommonLib/Contexts.cpp
@@ -1253,7 +1253,7 @@ const CtxSet ContextSetCfg::ImvFlag = ContextSetCfg::addCtxSet
  {    1,   4,   4,   5,},
 #endif
 #else
-#if BD_AFFINE_AMVR
+#if JVET_M0246_AFFINE_AMVR
  { 212, 214, 230, 182, 212, 214 },
  { 212, 214, 230, 182, 212, 214 },
  { CNU, CNU, CNU, CNU, CNU, CNU },