[MPlayer-cvslog] CVS: main/libmpdemux demux_ts.c,1.45,1.46

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv25029

Modified Files:
	demux_ts.c 
Log Message:
print ts_probe; 0x88 .. 0x8F in pes_private streams are not AC3 but DTS tracks (unsupported); save the size of the payload of the current PES packet in any case (used for ac3 detection)

Index: demux_ts.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ts.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- demux_ts.c	17 Feb 2006 01:57:41 -0000	1.45
+++ demux_ts.c	4 Mar 2006 11:00:20 -0000	1.46
@@ -963,7 +963,7 @@
 	}
 
 
-	mp_msg(MSGT_DEMUXER,MSGL_INFO, "Opened TS demuxer, audio: %x(pid %d), video: %x(pid %d)...POS=%"PRIu64"\n", params.atype, demuxer->audio->id, params.vtype, demuxer->video->id, (uint64_t) start_pos);
+	mp_msg(MSGT_DEMUXER,MSGL_INFO, "Opened TS demuxer, audio: %x(pid %d), video: %x(pid %d)...POS=%"PRIu64", PROBE=%"PRIu64"\n", params.atype, demuxer->audio->id, params.vtype, demuxer->video->id, (uint64_t) start_pos, ts_probe);
 
 
 	start_pos = (start_pos <= priv->ts.packet_size ? 0 : start_pos - priv->ts.packet_size);
@@ -1315,7 +1315,7 @@
 
 			return 1;
 		}
-		else if ((p[0] & 0xF0) == 0x80)
+		else if ((p[0] & 0xF8) == 0x80)
 		{
 			mp_msg(MSGT_DEMUX, MSGL_DBG2, "A52 WITH HEADER\n");
 			es->start   = p+4;
@@ -2867,6 +2867,8 @@
 			{
 				if(es->type == UNKNOWN)
 					return 0;
+				
+				tss->payload_size = es->payload_size;
 				if(len == 0)
 				{
 					if(tss->type != UNKNOWN)