From a0d9309eab07239c01f1a316d57e818bb9046068 Mon Sep 17 00:00:00 2001
From: Dmitry Kovalev <dkovalev@google.com>
Date: Mon, 15 Apr 2013 15:24:39 -0700
Subject: Removing TRUE and FALSE macro definitions.

Using regular 0 and 1 constants now.

Change-Id: Ie763503cbb727847cc8f1d6506cd6f2ee607f056
---
 vp9/common/vp9_blockd.h       | 3 ---
 vp9/common/vp9_common.h       | 3 ---
 vp9/common/vp9_findnearmv.c   | 2 +-
 vp9/common/vp9_mvref_common.c | 8 ++++----
 4 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'vp9/common')

diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index b9716628a..461e22f22 100644
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -21,9 +21,6 @@
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_enums.h"
 
-#define TRUE    1
-#define FALSE   0
-
 // #define MODE_STATS
 
 #define MB_FEATURE_TREE_PROBS   3
diff --git a/vp9/common/vp9_common.h b/vp9/common/vp9_common.h
index 3ffa513ea..dbfb9ed46 100644
--- a/vp9/common/vp9_common.h
+++ b/vp9/common/vp9_common.h
@@ -19,9 +19,6 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vpx/vpx_integer.h"
 
-#define TRUE    1
-#define FALSE   0
-
 #define MIN(x, y) (((x) < (y)) ? (x) : (y))
 #define MAX(x, y) (((x) > (y)) ? (x) : (y))
 
diff --git a/vp9/common/vp9_findnearmv.c b/vp9/common/vp9_findnearmv.c
index 053895840..bbbc2f62c 100644
--- a/vp9/common/vp9_findnearmv.c
+++ b/vp9/common/vp9_findnearmv.c
@@ -141,7 +141,7 @@ void vp9_find_best_ref_mvs(MACROBLOCKD *xd,
   unsigned int sse;
   unsigned int ref_scores[MAX_MV_REF_CANDIDATES] = {0};
   int_mv sorted_mvs[MAX_MV_REF_CANDIDATES];
-  int zero_seen = FALSE;
+  int zero_seen = 0;
 
   if (ref_y_buffer) {
 
diff --git a/vp9/common/vp9_mvref_common.c b/vp9/common/vp9_mvref_common.c
index e1a12e411..666197366 100644
--- a/vp9/common/vp9_mvref_common.c
+++ b/vp9/common/vp9_mvref_common.c
@@ -158,7 +158,7 @@ static void addmv_and_shuffle(
 
   int i;
   int insert_point;
-  int duplicate_found = FALSE;
+  int duplicate_found = 0;
 
   // Check for duplicates. If there is one increase its score.
   // We only compare vs the current top candidates.
@@ -171,7 +171,7 @@ static void addmv_and_shuffle(
   while (i > 0) {
     i--;
     if (candidate_mv.as_int == mv_list[i].as_int) {
-      duplicate_found = TRUE;
+      duplicate_found = 1;
       mv_scores[i] += weight;
       break;
     }
@@ -251,7 +251,7 @@ void vp9_find_mv_refs(VP9_COMMON *cm, MACROBLOCKD *xd, MODE_INFO *here,
   int split_count = 0;
   int (*mv_ref_search)[2];
   int *ref_distance_weight;
-  int zero_seen = FALSE;
+  int zero_seen = 0;
   const int mb_col = (-xd->mb_to_left_edge) >> 7;
 
   // Blank the reference vector lists and other local structures.
@@ -395,7 +395,7 @@ void vp9_find_mv_refs(VP9_COMMON *cm, MACROBLOCKD *xd, MODE_INFO *here,
   // Scan for 0,0 case and clamp non zero choices
   for (i = 0; i < MAX_MV_REF_CANDIDATES; ++i) {
     if (candidate_mvs[i].as_int == 0) {
-      zero_seen = TRUE;
+      zero_seen = 1;
     } else {
       clamp_mv_ref(xd, &candidate_mvs[i]);
     }
-- 
cgit v1.2.3