--- branches/dev-api-4/xvidcore/src/motion/motion.h	2003/06/27 13:53:41	1076
+++ branches/dev-api-4/xvidcore/src/motion/motion.h	2003/06/28 15:54:16	1077
@@ -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.3 2003-06-09 13:54:25 edgomez Exp $
+ *  $Id: motion.h,v 1.20.2.4 2003-06-28 15:51:18 chl Exp $
  *
  ***************************************************************************/
 
@@ -117,39 +117,6 @@
 							const IMAGE * const b_refhv,
 							int16_t * dct_codes);
 
-
-/* GMC stuff. Maybe better put it into a separate file */
-
-void
-generate_GMCparameters(	const int num_wp,				/* [input]: number of warppoints */
-						const int res, 					/* [input]: resolution */
-						const WARPPOINTS *const warp, 	/* [input]: warp points */
-						const int width, const int height, 	/* [input]: without edges! */
-						GMC_DATA *const gmc); 		/* [output] precalculated parameters */
-
-void
-generate_GMCimage(	const GMC_DATA *const gmc_data, 	/* [input] precalculated data */
-					const IMAGE *const pRef,			/* [input] */
-					const int mb_width,
-					const int mb_height,
-					const int stride,
-					const int stride2,
-					const int fcode, 					/* [input] some parameters... */
-					const int32_t quarterpel,			/* [input] for rounding avgMV */
-					const int reduced_resolution,		/* [input] ignored */
-					const int32_t rounding,			/* [input] for rounding image data */
-					MACROBLOCK *const pMBs, 	/* [output] average motion vectors */
-					IMAGE *const pGMC);			/* [output] full warped image */
-
-VECTOR generate_GMCimageMB(	const GMC_DATA *const gmc_data, 	/* [input] all precalc data */
-							const IMAGE *const pRef,			/* [input] */
-							const int mi, const int mj, 		/* [input] MB position */
-							const int stride,					/* [input] Lumi stride */
-							const int stride2,					/* [input] chroma stride */
-							const int quarterpel, 				/* [input] for rounding of AvgMV */
-							const int rounding,
-							IMAGE *const pGMC);					/* [outut] generate image */
-
 int
 MEanalysis(	const IMAGE * const pRef,
 			const FRAMEINFO * const Current,