libvpx: Pull from upstream

source/libvpx/vp8/encoder/encodemv.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 
 #include "vp8/common/common.h"
 #include "encodemv.h"
 #include "vp8/common/entropymode.h"
 #include "vp8/common/systemdependent.h"
 
 #include <math.h>
 
-#ifdef ENTROPY_STATS
+#ifdef VP8_ENTROPY_STATS
 extern unsigned int active_section;
 #endif
 
 static void encode_mvcomponent(
     vp8_writer *const w,
     const int v,
     const struct mv_context *mvc
 )
 {
     const vp8_prob *p = mvc->prob;
@@ skipping 322 matching lines @@
 
         while (++j < mvlong_width);
     }
 }
 
 void vp8_write_mvprobs(VP8_COMP *cpi)
 {
     vp8_writer *const w  = cpi->bc;
     MV_CONTEXT *mvc = cpi->common.fc.mvc;
     int flags[2] = {0, 0};
-#ifdef ENTROPY_STATS
+#ifdef VP8_ENTROPY_STATS
     active_section = 4;
 #endif
     write_component_probs(
         w, &mvc[0], &vp8_default_mv_context[0], &vp8_mv_update_probs[0],
         cpi->mb.MVcount[0], 0, &flags[0]
     );
     write_component_probs(
         w, &mvc[1], &vp8_default_mv_context[1], &vp8_mv_update_probs[1],
         cpi->mb.MVcount[1], 1, &flags[1]
     );
 
     if (flags[0] || flags[1])
         vp8_build_component_cost_table(cpi->mb.mvcost, (const MV_CONTEXT *) cpi->common.fc.mvc, flags);
 
-#ifdef ENTROPY_STATS
+#ifdef VP8_ENTROPY_STATS
     active_section = 5;
 #endif
 }