--- motion.h	2003/09/10 22:18:59	1.20.2.5
+++ motion.h	2005/12/18 06:52:12	1.24
@@ -26,7 +26,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- *  $Id: motion.h,v 1.20.2.5 2003/09/10 22:18:59 edgomez Exp $
+ *  $Id: motion.h,v 1.24 2005/12/18 06:52:12 syskin Exp $
  *
  ***************************************************************************/
 
@@ -52,7 +52,7 @@
 
 /** MotionEstimation **/
 
-bool MotionEstimation(MBParam * const pParam,
+void MotionEstimation(MBParam * const pParam,
 					FRAMEINFO * const current,
 					FRAMEINFO * const reference,
 					const IMAGE * const pRefH,
@@ -61,7 +61,7 @@
 					const IMAGE * const pGMC,
 					const uint32_t iLimit);
 
-void 
+void
 MotionEstimationBVOP(MBParam * const pParam,
 						FRAMEINFO * const frame,
 						const int32_t time_bp,
@@ -108,8 +108,8 @@
 				const IMAGE * const pRefHV);
 
 int
-globalSAD(const WARPPOINTS *const wp, 
-		  const MBParam * const pParam, 
+globalSAD(const WARPPOINTS *const wp,
+		  const MBParam * const pParam,
 		  const MACROBLOCK * const pMBs,
 		  const FRAMEINFO * const current,
 		  const IMAGE * const pRef,
@@ -124,7 +124,8 @@
 			const int maxIntra,
 			const int intraCount,
 			const int bCount,
-			const int b_thresh);
+			const int b_thresh,
+			const MACROBLOCK * const prev_mbs);
 
 /** MotionCompensation **/
 
@@ -143,10 +144,9 @@
 					const uint32_t height,
 					const uint32_t edged_width,
 					const int32_t quarterpel,
-					const int reduced_resolution,
 					const int32_t rounding);
 
-void 
+void
 MBMotionCompensationBVOP(MBParam * pParam,
 							MACROBLOCK * const mb,
 							const uint32_t i,