From e651078e7800f273526c2e80a00225c5eeeee598 Mon Sep 17 00:00:00 2001
From: Ari Koivula <ari@koivu.la>
Date: Wed, 26 Feb 2014 16:05:38 +0200
Subject: [PATCH] Fix compilation for rebase.

Conflicts:
	src/search.c
---
 src/picture.h | 2 +-
 src/search.c  | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/picture.h b/src/picture.h
index 0d1f31cb..b37a8332 100644
--- a/src/picture.h
+++ b/src/picture.h
@@ -147,7 +147,7 @@ typedef struct
 
 
 
-#define SUB_SCU_BIT_MASK (64 - 1);
+#define SUB_SCU_BIT_MASK (64 - 1)
 #define SUB_SCU(xy) (xy & SUB_SCU_BIT_MASK)
 #define LCU_CU_WIDTH 8
 #define LCU_T_CU_WIDTH 9
diff --git a/src/search.c b/src/search.c
index 1213deeb..58d77fdb 100644
--- a/src/search.c
+++ b/src/search.c
@@ -319,7 +319,6 @@ static void search_inter(encoder_control *encoder, uint16_t x_ctb,
 }
 
 
-
 /**
  * Copy all non-reference CU data from depth+1 to depth.
  */
@@ -858,9 +857,8 @@ uint32_t search_best_mode(encoder_control *encoder,
  */
 void search_slice_data(encoder_control *encoder)
 {
-#ifdef USE_NEW_SEARCH
   search_frame(encoder);
-#else
+  /*
   int16_t x_lcu, y_lcu;
 
   // Initialize the costs in the cu-array used for searching.
@@ -878,7 +876,7 @@ void search_slice_data(encoder_control *encoder)
       }
     }
   }
-  /*
+  
   // Loop through every LCU in the slice
   for (y_lcu = 0; y_lcu < encoder->in.height_in_lcu; y_lcu++) {
     for (x_lcu = 0; x_lcu < encoder->in.width_in_lcu; x_lcu++) {
@@ -895,5 +893,4 @@ void search_slice_data(encoder_control *encoder)
     }
   }
   */
-#endif
 }