Merge "Enable fast forward txfm and quant for rate-distortion search"

[libvpx] / vp9 / encoder / vp9_block.h

diff --git a/vp9/encoder/vp9_block.h b/vp9/encoder/vp9_block.h
index 3e80eb52cea15be1f639040c3f79308676c64193..bd3b0fdc85d8c08e1f6099573b5ac50722a6291a 100644 (file)
--- a/vp9/encoder/vp9_block.h
+++ b/vp9/encoder/vp9_block.h
@@ -67,7 +67,7 @@ struct macroblock {
   int sadperbit4;
   int rddiv;
   int rdmult;
-  unsigned int mb_energy;
+  int mb_energy;
 
   int mv_best_ref_index[MAX_REF_FRAMES];
   unsigned int max_mv_context[MAX_REF_FRAMES];