[CFL] Move cfl_init out of plane loop

Change-Id: I3ce09c03d4306c1f2a9c70aa1e82126493bc9406

av1/common/onyxc_int.h

@@ -529,10 +529,6 @@ static INLINE void av1_init_macroblockd(AV1_COMMON *cm, MACROBLOCKD *xd,
     xd->plane[i].dqcoeff = dqcoeff;
 #if CONFIG_PVQ
     xd->plane[i].pvq_ref_coeff = pvq_ref_coeff;
-#endif
-#if CONFIG_CFL
-    xd->cfl = cfl;
-    cfl_init(cfl, cm);
 #endif
     xd->above_context[i] = cm->above_context[i];
     if (xd->plane[i].plane_type == PLANE_TYPE_Y) {
@@ -561,6 +557,10 @@ static INLINE void av1_init_macroblockd(AV1_COMMON *cm, MACROBLOCKD *xd,
   xd->above_seg_context = cm->above_seg_context;
 #if CONFIG_VAR_TX
   xd->above_txfm_context = cm->above_txfm_context;
+#endif
+#if CONFIG_CFL
+  cfl_init(cfl, cm);
+  xd->cfl = cfl;
 #endif
   xd->mi_stride = cm->mi_stride;
   xd->error_info = &cm->error;