--- branches/dev-api-3/xvidcore/src/bitstream/mbcoding.h	2002/09/23 20:36:02	530
+++ branches/dev-api-3/xvidcore/src/bitstream/mbcoding.h	2002/12/08 06:43:34	698
@@ -9,6 +9,9 @@
 
 int check_resync_marker(Bitstream * bs, int addbits);
 
+void bs_put_spritetrajectory(Bitstream * bs, const int val);
+int bs_get_spritetrajectory(Bitstream * bs);
+
 int get_mcbpc_intra(Bitstream * bs);
 int get_mcbpc_inter(Bitstream * bs);
 int get_cbpy(Bitstream * bs,
@@ -21,18 +24,13 @@
 int get_dc_size_lum(Bitstream * bs);
 int get_dc_size_chrom(Bitstream * bs);
 
-static int get_coeff(Bitstream * bs,
-			  int *run,
-			  int *last,
-			  int intra,
-			  int short_video_header);
-
 void get_intra_block(Bitstream * bs,
 					 int16_t * block,
 					 int direction,
 					 int coeff);
 void get_inter_block(Bitstream * bs,
-					 int16_t * block);
+					 int16_t * block,
+					 int direction);
 
 
 void MBCodingBVOP(const MACROBLOCK * mb,
@@ -40,7 +38,8 @@
 				  const int32_t fcode,
 				  const int32_t bcode,
 				  Bitstream * bs,
-				  Statistics * pStat);
+				  Statistics * pStat,
+				  int alternate_scan);
 
 
 static __inline void