Merge "Merge tag 'v3.1.3' into HEAD"
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 7eb4db5..d77d50b 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -2305,8 +2305,7 @@
     variance_partition_alloc(cpi);
 
   if (cm->current_frame.frame_type == KEY_FRAME ||
-      ((sf->inter_sf.extra_prune_warped &&
-        cm->current_frame.refresh_frame_flags & (1 << GOLDEN_FRAME))))
+      ((sf->inter_sf.extra_prune_warped && cpi->refresh_frame.golden_frame)))
     copy_frame_prob_info(cpi);
 
 #if CONFIG_COLLECT_COMPONENT_TIMING