--- bitstream.h	2004/12/05 13:56:13	1.20
+++ bitstream.h	2010/12/28 19:19:57	1.25.2.1
@@ -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.20 2004/12/05 13:56:13 syskin Exp $
+ * $Id: bitstream.h,v 1.25.2.1 2010/12/28 19:19:57 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,
@@ -146,8 +147,31 @@
 							 unsigned int quant);
 
 void BitstreamWriteUserData(Bitstream * const bs,
-							uint8_t * data,
-							const int length);
+							const char *data,
+							const unsigned int length);
+
+void
+BitstreamWriteEndOfSequence(Bitstream * const bs);
+
+void
+BitstreamWriteGroupOfVopHeader(Bitstream * const bs,
+                               const MBParam * pParam,
+                               uint32_t is_closed_gov);
+
+void write_video_packet_header(Bitstream * const bs,
+                               const MBParam * pParam,
+                               const FRAMEINFO * const frame,
+                               int mbnum);
+
+/*****************************************************************************
+ * Bitstream
+ ****************************************************************************/
+
+/* Input buffer should be readable as full chunks of 8bytes, including
+the end of the buffer. Padding might be appropriate. If only chunks
+of 4bytes are applicable, define XVID_SAFE_BS_TAIL. Note that this will
+slow decoding, so consider this as a last-resort solution */
+/* #define XVID_SAFE_BS_TAIL */
 
 /* initialise bitstream structure */
 
@@ -180,8 +204,12 @@
 #endif
 	bs->bufb = tmp;
 
-	bs->buf = 0;
-	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));
+	else
+		bs->buf = 0;
 	bs->length = length;
 }
 
@@ -207,7 +235,11 @@
 #endif
 	bs->bufb = tmp;
 
-	bs->buf = 0;
+	/* preserve the intervening bytes */
+	if (bs->initpos > 0)
+		bs->buf = bs->bufa & (0xffffffff << (32 - bs->initpos));
+	else
+		bs->buf = 0;
 	bs->pos = bs->initpos;
 }
 
@@ -242,12 +274,22 @@
 		uint32_t tmp;
 
 		bs->bufa = bs->bufb;
-		tmp = *((uint32_t *) bs->tail + 2);
+#if defined(XVID_SAFE_BS_TAIL)
+		if (bs->tail<(bs->start+((bs->length+3)>>2)))
+#endif
+		{
+			tmp = *((uint32_t *) bs->tail + 2);
 #ifndef ARCH_IS_BIG_ENDIAN
-		BSWAP(tmp);
+			BSWAP(tmp);
+#endif
+			bs->bufb = tmp;
+			bs->tail++;
+		}
+#if defined(XVID_SAFE_BS_TAIL)
+		else {
+			bs->bufb = 0;
+		}
 #endif
-		bs->bufb = tmp;
-		bs->tail++;
 		bs->pos -= 32;
 	}
 }