Merge "Fix inconsistency in gm parameter write to bitstream" into nextgenv2

d2b1fe4a · Sarah Parker · Gerrit Code Review · 445ae93e · 689b0cae · d2b1fe4a
Commit d2b1fe4a authored Oct 12, 2016 by Sarah Parker Committed by Gerrit Code Review Oct 12, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

av1/encoder/bitstream.c av1/encoder/bitstream.c +2 -2

No files found.
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3538,10 +3538,10 @@ static uint32_t write_compressed_header(AV1_COMP *cpi, uint8_t *data) {
 #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);