--- bitstream.c	2004/05/28 21:40:11	1.42.2.3
+++ bitstream.c	2004/07/09 14:52:56	1.45
@@ -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.42.2.3 2004/05/28 21:40:11 edgomez Exp $
+ * $Id: bitstream.c,v 1.45 2004/07/09 14:52:56 syskin Exp $
  *
  ****************************************************************************/
 
@@ -71,8 +71,10 @@
 		matrix[scan_tables[0][i++]] = value;
 	}
 	while (value != 0 && i < 64);
-        i--;    /* fix little bug at coeff not full */
 
+	if (value != 0) return;
+
+	i--;
 	while (i < 64) {
 		matrix[scan_tables[0][i++]] = last;
 	}
@@ -814,23 +816,12 @@
 			if (coding_type != B_VOP) {
 				dec->last_time_base = dec->time_base;
 				dec->time_base += time_incr;
-				dec->time = time_increment;
-
-#if 0
-					dec->time_base * dec->time_inc_resolution +
-					time_increment;
-#endif
-					dec->time_pp = (uint32_t)
-						(dec->time_inc_resolution + dec->time - dec->last_non_b_time)%dec->time_inc_resolution;
+				dec->time = dec->time_base*dec->time_inc_resolution + time_increment;
+				dec->time_pp = (int32_t)(dec->time - dec->last_non_b_time);
 				dec->last_non_b_time = dec->time;
 			} else {
-				dec->time = time_increment;
-#if 0
-					(dec->last_time_base +
-					 time_incr) * dec->time_inc_resolution + time_increment;
-#endif
-				dec->time_bp = (uint32_t)
-					(dec->time_inc_resolution + dec->last_non_b_time - dec->time)%dec->time_inc_resolution;
+				dec->time = (dec->last_time_base + time_incr)*dec->time_inc_resolution + time_increment;
+				dec->time_bp = dec->time_pp - (int32_t)(dec->last_non_b_time - dec->time);
 			}
 			DPRINTF(XVID_DEBUG_HEADER,"time_pp=%i\n", dec->time_pp);
 			DPRINTF(XVID_DEBUG_HEADER,"time_bp=%i\n", dec->time_bp);
@@ -1023,7 +1014,7 @@
 				else
 					sscanf(tmp, "XviD%d", &dec->bs_version);
 
-				DPRINTF(XVID_DEBUG_HEADER, "xvid bitstream version=%i", dec->bs_version);
+				DPRINTF(XVID_DEBUG_HEADER, "xvid bitstream version=%i\n", dec->bs_version);
 			}
 
 		    /* divx detection */