commit 0ad5c625be27d7a3622dae95e9afe5e66b112d46
author Jack Haughton <jack.haughton@argondesign.com> Mon Nov 26 13:54:48 2018 +0000
committer Jack Haughton <jack.haughton@argondesign.com> Mon Nov 26 17:10:37 2018 +0000
tree f786e96c844d86e0fa2dc5165997c06d60acf4a0
parent 352c10bb5b6466e21c657c2ef5de53d793e26724

Set up frame context using next_ref_frame_map

BUG: oss-fuzz:11523
Change-Id: Idec84e85f39fa6e2205853763002898b6ab1b410

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index d17e605..f9de800 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -4755,7 +4755,8 @@
   generate_next_ref_frame_map(pbi);
 
   // Reload the adapted CDFs from when we originally coded this keyframe
-  *cm->fc = frame_bufs[cm->ref_frame_map[existing_frame_idx]].frame_context;
+  *cm->fc =
+      frame_bufs[cm->next_ref_frame_map[existing_frame_idx]].frame_context;
 }
 
 static INLINE void reset_frame_buffers(AV1_COMMON *cm) {