--- bitstream.h	2006/11/01 09:26:52	1.22.2.2
+++ bitstream.h	2010/12/28 19:19:43	1.26
@@ -19,7 +19,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.h,v 1.22.2.2 2006/11/01 09:26:52 Isibaar Exp $
+ * $Id: bitstream.h,v 1.26 2010/12/28 19:19:43 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -137,7 +137,8 @@
 
 void BitstreamWriteVolHeader(Bitstream * const bs,
 							 const MBParam * pParam,
-							 const FRAMEINFO * const frame);
+							 const FRAMEINFO * const frame,
+							 const int num_slices);
 
 void BitstreamWriteVopHeader(Bitstream * const bs,
 							 const MBParam * pParam,
@@ -203,7 +204,7 @@
 #endif
 	bs->bufb = tmp;
 
-	bs->pos = bs->initpos = bitpos*8;
+	bs->pos = bs->initpos = (uint32_t) bitpos*8;
 	/* preserve the intervening bytes */
 	if (bs->initpos > 0)
 		bs->buf = bs->bufa & (0xffffffff << (32 - bs->initpos));