--- motion.h	2002/07/21 23:34:08	1.13
+++ motion.h	2002/09/07 09:18:48	1.16
@@ -1,7 +1,18 @@
-/**************************************************************************
+/*****************************************************************************
  *
  *  XVID MPEG-4 VIDEO CODEC
- *  -  Motion sad header  -
+ *  - Motion Estimation header -
+ *
+ *  Copyright(C) 2002 Christoph Lampert <gruel@web.de>
+ *
+ *  This program is an implementation of a part of one or more MPEG-4
+ *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
+ *  to use this software module in hardware or software products are
+ *  advised that its use may infringe existing patents or copyrights, and
+ *  any such use would be at such party's own risk.  The original
+ *  developer of this software module and his/her company, and subsequent
+ *  editors and their companies, will have no liability for use of this
+ *  software or modifications or derivatives thereof.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,7 +28,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.13 2002/07/21 23:34:08 chl Exp $
+ *  $Id: motion.h,v 1.16 2002/09/07 09:18:48 chl Exp $
  *
  ***************************************************************************/
 
@@ -27,7 +38,7 @@
 #include "../portab.h"
 #include "../global.h"
 
-/* hard coded motion search parameters for motion_est and smp_motion_est */
+/* hard coded motion search parameters for motion_est */
 
 // very large value
 #define MV_MAX_ERROR	(4096 * 256)
@@ -336,52 +347,6 @@
 				 const IMAGE * const pRefHV,
 				 const uint32_t iLimit);
 
-#ifdef _SMP			 
-bool
-SMP_MotionEstimation(MBParam * const pParam,
-				 FRAMEINFO * const current,
-				 FRAMEINFO * const reference,
-				 const IMAGE * const pRefH,
-				 const IMAGE * const pRefV,
-				 const IMAGE * const pRefHV,
-				 const uint32_t iLimit);
-#endif
-
-
-void MotionEstimationBVOP(MBParam * const pParam,
-						  FRAMEINFO * const frame,
-						  // forward (past) reference 
-						  const int32_t time_bp,
-						  const int32_t time_pp,
-						  const MACROBLOCK * const f_mbs,
-						  const IMAGE * const f_ref,
-						  const IMAGE * const f_refH,
-						  const IMAGE * const f_refV,
-						  const IMAGE * const f_refHV,
-						  // backward (future) reference
-						  const MACROBLOCK * const b_mbs,
-						  const IMAGE * const b_ref,
-						  const IMAGE * const b_refH,
-						  const IMAGE * const b_refV,
-						  const IMAGE * const b_refHV);
-
-void MBMotionCompensationBVOP(MBParam * pParam,
-							  MACROBLOCK * const mb,
-							  const uint32_t i,
-							  const uint32_t j,
-							  IMAGE * const cur,
-							  const IMAGE * const f_ref,
-							  const IMAGE * const f_refh,
-							  const IMAGE * const f_refv,
-							  const IMAGE * const f_refhv,
-							  const IMAGE * const b_ref,
-							  const IMAGE * const b_refh,
-							  const IMAGE * const b_refv,
-							  const IMAGE * const b_refhv,
-							  int16_t * dct_codes);
-
-
-
 typedef int32_t(Halfpel8_RefineFunc) (const uint8_t * const pRef,
 				      const uint8_t * const pRefH,
 				      const uint8_t * const pRefV,