commit 689b0caea70ad5e76754c9ce2595065df739cf08
author Sarah Parker <sarahparker@google.com> Tue Oct 11 12:06:33 2016 -0700
committer Sarah Parker <sarahparker@google.com> Tue Oct 11 19:35:26 2016 -0700
tree fb43b174e3b9b3b6a80e151d5b2df47f2e3e0c41
parent b5e73bddb08b208afe8f9969ff94b2e2e9f6d53b

Fix inconsistency in gm parameter write to bitstream

Before this change, gm parameters were being written to the
bitstream for all frames, but only read for inter only frames,
causing a bitstream error.

Change-Id: I63b8e2fdf6358e07cc00718de04cc399809bde37

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 77aee22..2b846e8 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3536,10 +3536,10 @@
 #if CONFIG_SUPERTX
     if (!xd->lossless[0]) update_supertx_probs(cm, header_bc);
 #endif  // CONFIG_SUPERTX
-  }
 #if CONFIG_GLOBAL_MOTION
-  write_global_motion(cpi, header_bc);
+    write_global_motion(cpi, header_bc);
 #endif  // CONFIG_GLOBAL_MOTION
+  }
 #if CONFIG_ANS
   ans_write_init(&header_ans, data);
   buf_ans_flush(header_bc, &header_ans);