--- decoder.c	2004/04/11 09:41:27	1.54
+++ decoder.c	2004/04/19 12:42:01	1.56
@@ -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: decoder.c,v 1.54 2004/04/11 09:41:27 syskin Exp $
+ * $Id: decoder.c,v 1.56 2004/04/19 12:42:01 syskin Exp $
  *
  ****************************************************************************/
 
@@ -222,6 +222,7 @@
 	dec->time = dec->time_base = dec->last_time_base = 0;
 	dec->low_delay = 0;
 	dec->packed_mode = 0;
+	dec->time_inc_resolution = 1; /* until VOL header says otherwise */
 
 	dec->fixed_dimensions = (dec->width > 0 && dec->height > 0);
 
@@ -1360,17 +1361,19 @@
 					xvid_dec_frame_t * frame, xvid_dec_stats_t * stats,
 					int coding_type, int quant)
 {
+	const int brightness = XVID_VERSION_MINOR(frame->version) >= 1 ? frame->brightness : 0;
+
 	if (dec->cartoon_mode)
 		frame->general &= ~XVID_FILMEFFECT;
 
-	if ((frame->general & (XVID_DEBLOCKY|XVID_DEBLOCKUV|XVID_FILMEFFECT) || frame->brightness!=0) 
+	if ((frame->general & (XVID_DEBLOCKY|XVID_DEBLOCKUV|XVID_FILMEFFECT) || brightness!=0) 
 		&& mbs != NULL)	/* post process */
 	{
 		/* note: image is stored to tmp */
 		image_copy(&dec->tmp, img, dec->edged_width, dec->height);
 		image_postproc(&dec->postproc, &dec->tmp, dec->edged_width, 
 					   mbs, dec->mb_width, dec->mb_height, dec->mb_width,
-					   frame->general, frame->brightness, dec->frames, (coding_type == B_VOP));
+					   frame->general, brightness, dec->frames, (coding_type == B_VOP));
 		img = &dec->tmp;
 	}
 
@@ -1490,6 +1493,11 @@
 		goto repeat;
 	}
 
+	if(dec->frames == 0 && coding_type != I_VOP) {
+		/* 1st frame is not an i-vop */
+		goto repeat;
+	}
+
 	dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.y = dec->p_fmv.y = 0;	/* init pred vector to 0 */
 
 	/* packed_mode: special-N_VOP treament */