--- trunk/xvidcore/src/bitstream/bitstream.c	2010/12/28 19:19:57	1928
+++ trunk/xvidcore/src/bitstream/bitstream.c	2019/01/17 14:22:17	2170
@@ -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.61 2010-12-28 19:19:43 Isibaar Exp $
+ * $Id$
  *
  ****************************************************************************/
 
@@ -129,7 +129,7 @@
 		}
 	}
 
-	mbnum = BitstreamGetBits(bs, mbnum_bits);		/* macroblock_number */
+	mbnum = (mbnum_bits == 0) ? 0 : BitstreamGetBits(bs, mbnum_bits);		/* macroblock_number */
 	DPRINTF(XVID_DEBUG_HEADER, "mbnum %i\n", mbnum);
 
 	if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY)
@@ -153,6 +153,8 @@
 		READ_MARKER();
 		if (dec->time_inc_bits)
 			time_increment = (BitstreamGetBits(bs, dec->time_inc_bits));	/* vop_time_increment */
+		else
+			time_increment = 0;
 		READ_MARKER();
 		DPRINTF(XVID_DEBUG_HEADER,"time %i:%i\n", time_base, time_increment);
 
@@ -860,8 +862,9 @@
 				dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR &&
 				(coding_type == P_VOP || coding_type == I_VOP)) {
 
-				if (BitstreamGetBit(bs));
+				if (BitstreamGetBit(bs)) {
 					DPRINTF(XVID_DEBUG_ERROR, "RRV not supported (anymore)\n");
+				}
 			}
 
 			if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) {