--- bitstream.h	2005/05/23 09:29:43	1.22
+++ bitstream.h	2006/07/10 15:05:30	1.22.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.22 2005/05/23 09:29:43 Skal Exp $
+ * $Id: bitstream.h,v 1.22.2.1 2006/07/10 15:05:30 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -193,7 +193,12 @@
 #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 = bitpos*8;
 	bs->length = length;
 }
@@ -220,7 +225,12 @@
 #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;
 }