--- trunk/xvidcore/src/bitstream/mbcoding.h	2002/06/28 15:14:40	248
+++ branches/dev-api-4/xvidcore/src/bitstream/mbcoding.h	2003/06/09 01:25:19	1053
@@ -3,14 +3,16 @@
 
 #include "../portab.h"
 #include "../global.h"
+#include "vlc_codes.h"
 #include "bitstream.h"
 
 void init_vlc_tables(void);
 
-void skip_stuffing(Bitstream *bs);
-
 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,
@@ -23,18 +25,13 @@
 int get_dc_size_lum(Bitstream * bs);
 int get_dc_size_chrom(Bitstream * bs);
 
-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,
@@ -42,6 +39,22 @@
 				  const int32_t fcode,
 				  const int32_t bcode,
 				  Bitstream * bs,
-				  Statistics * pStat);
+				  Statistics * pStat,
+				  int alternate_scan);
+
+
+static __inline void
+MBSkip(Bitstream * bs)
+{
+	BitstreamPutBit(bs, 1);	/* not coded */
+}
+
+
+#ifdef BIGLUT
+extern VLC *intra_table;
+int CodeCoeff_CalcBits(const int16_t qcoeff[64], VLC * table, const uint16_t * zigzag, uint16_t intra);
+#else
+int CodeCoeffIntra_CalcBits(const int16_t qcoeff[64], const uint16_t * zigzag);
+#endif
 
 #endif							/* _MB_CODING_H_ */