[xine-cvs] CVS: xine-lib/src/libmpeg2 decode.c,1.61,1.62

[Miguel F. <mig...@us...>]

Update of /cvsroot/xine/xine-lib/src/libmpeg2
In directory usw-pr-cvs1:/tmp/cvs-serv14297

Modified Files:
	decode.c 
Log Message:
fix bad_frame logic (bug introduced in 0.2.1 sync)


Index: decode.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libmpeg2/decode.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- decode.c	3 Apr 2002 23:13:34 -0000	1.61
+++ decode.c	6 Apr 2002 02:10:33 -0000	1.62
@@ -136,7 +136,7 @@
     }
   }
   
-  /* printf("mpeg2dec: rff=%u\n",frame->repeat_first_field); */
+  printf("mpeg2dec: rff=%u\n",frame->repeat_first_field);
 } 
 
 static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code,
@@ -167,12 +167,13 @@
 	mpeg2dec->in_slice = 0;
 
 	if (((picture->picture_structure == FRAME_PICTURE) ||
-	     (picture->second_field)) &&
-	    (!(mpeg2dec->drop_frame))) {
-	    
+	     (picture->second_field)) ) {
+	  
+	  if (!mpeg2dec->drop_frame)
+	    picture->current_frame->bad_frame = 0;
+   
 	  if (picture->picture_coding_type == B_TYPE) {
 	    if( picture->current_frame && !picture->current_frame->drawn ) {
-	      picture->current_frame->bad_frame = 0;
 
 	      /* hack against wrong mpeg1 pts */
 	      if (picture->mpeg1)