[MPlayer-cvslog] r20480 - trunk/libmpdemux/demux_ts.c

[nicodvb]

Author: nicodvb
Date: Sat Oct 28 11:03:51 2006
New Revision: 20480

Modified:
   trunk/libmpdemux/demux_ts.c

Log:
10l: fixed misplaced adaption field check

Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c	(original)
+++ trunk/libmpdemux/demux_ts.c	Sat Oct 28 11:03:51 2006
@@ -2622,6 +2622,12 @@
 		bad = ts_error; // || (! cc_ok);
     
 		afc = (packet[3] >> 4) & 3;
+		if(! (afc % 2))	//no payload in this TS packet
+		{
+			stream_skip(stream, buf_size-1+junk);
+			continue;
+		}
+		
 		if(afc > 1)
 		{
 			int c;
@@ -2637,12 +2643,6 @@
 				continue;
 		}
 		
-		if(! (afc % 2))	//no payload in this TS packet
-		{
-			stream_skip(stream, buf_size-1+junk);
-			continue;
-		}
-		
 		if(bad)
 		{
 			// logically this packet should be dropped, but if I do it