--- bitstream.c	2003/06/09 13:51:34	1.39.2.11
+++ bitstream.c	2003/06/29 16:17:51	1.39.2.14
@@ -20,7 +20,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: bitstream.c,v 1.39.2.11 2003/06/09 13:51:34 edgomez Exp $
+ * $Id: bitstream.c,v 1.39.2.14 2003/06/29 16:17:51 chl Exp $
  *
  ****************************************************************************/
 
@@ -36,8 +36,6 @@
 static uint32_t __inline
 log2bin(uint32_t value)
 {
-/* Changed by Chenm001 */
-#if !defined(_MSC_VER)
 	int n = 0;
 
 	while (value) {
@@ -45,12 +43,6 @@
 		n++;
 	}
 	return n;
-#else
-	__asm {
-		bsr eax, value 
-		inc eax
-	}
-#endif
 }
 
 
@@ -1022,6 +1014,12 @@
 
 			DPRINTF(XVID_DEBUG_STARTCODE, "<user_data>: %s\n", tmp);
 
+			/* read xvid bitstream version */
+			if(strncmp(tmp, "XviD", 4) == 0) {
+				sscanf(tmp, "XviD%d", &dec->bs_version);
+				DPRINTF(XVID_DEBUG_HEADER, "xvid bitstream version=%i", dec->bs_version);
+			}
+
 		    /* divx detection */
 			i = sscanf(tmp, "DivX%dBuild%d%c", &version, &build, &packed);
 			if (i < 2)
@@ -1187,7 +1185,7 @@
 	if (vol_ver_id != 1) 
 	{	if ((pParam->vol_flags & XVID_VOL_GMC))
 		{	BitstreamPutBits(bs, 2, 2);		/* sprite_enable=='GMC' */
-			BitstreamPutBits(bs, 2, 6);		/* no_of_sprite_warping_points */
+			BitstreamPutBits(bs, 3, 6);		/* no_of_sprite_warping_points */
 			BitstreamPutBits(bs, 3, 2);		/* sprite_warping_accuracy 0==1/2, 1=1/4, 2=1/8, 3=1/16 */
 			BitstreamPutBit(bs, 0);			/* sprite_brightness_change (not supported) */
 
@@ -1324,7 +1322,7 @@
 	if (frame->coding_type == S_VOP) {
 		if (1)	{		/* no_of_sprite_warping_points>=1 (we use 2!) */
 			int k;
-			for (k=0;k<2;k++)
+			for (k=0;k<3;k++)
 			{
 				bs_put_spritetrajectory(bs, frame->warp.duv[k].x ); /* du[k]  */
 				WRITE_MARKER();