diff -Naur main/cfg-common.h main.new/cfg-common.h
--- main/cfg-common.h	2003-09-01 00:18:24.000000000 +0200
+++ main.new/cfg-common.h	2003-09-03 22:12:15.000000000 +0200
@@ -76,9 +76,9 @@
 	{"forceidx", &index_mode, CONF_TYPE_FLAG, 0, -1, 2, NULL},
 
 	// select audio/videosubtitle stream
-	{"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 8192, NULL},
-	{"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 8192, NULL},
-	{"sid", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
+	{"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL},
+	{"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL},
+	{"sid", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL},
 	{"novideo", &video_id, CONF_TYPE_FLAG, 0, -1, -2, NULL},
 
 	{ "hr-mp3-seek", &hr_mp3_seek, CONF_TYPE_FLAG, 0, 0, 1, NULL },
@@ -184,6 +184,7 @@
 	{"tsfastparse", "-tsfastparse isn't a valid option anymore.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL
 },
 	{"tsprog", &ts_prog, CONF_TYPE_INT, CONF_RANGE, 0, 65534, NULL},
+	{"tsprobe", &ts_probe, CONF_TYPE_POSITION, 0, 0, 2000000, NULL},
 
 	// draw by slices or whole frame (useful with libmpeg2/libavcodec)
 	{"slices", &vd_use_slices, CONF_TYPE_FLAG, 0, 0, 1, NULL},
@@ -286,6 +287,7 @@
 extern char* sub_stream;
 extern int demuxer_type, audio_demuxer_type, sub_demuxer_type;
 extern int ts_prog;
+extern off_t ts_probe;
 
 #include "libmpdemux/tv.h"
 
diff -Naur main/libmpdemux/demux_ts.c main.new/libmpdemux/demux_ts.c
--- main/libmpdemux/demux_ts.c	2003-08-31 20:51:05.000000000 +0200
+++ main.new/libmpdemux/demux_ts.c	2003-09-03 22:13:03.000000000 +0200
@@ -42,12 +42,13 @@
 
 #define MAX_HEADER_SIZE 6			/* enough for PES header + length */
 #define MAX_CHECK_SIZE	65535
-#define MAX_PROBE_SIZE	2000000
 #define NUM_CONSECUTIVE_TS_PACKETS 32
 #define NUM_CONSECUTIVE_AUDIO_PACKETS 348
 
 
 int ts_prog;
+off_t ts_probe = 2000000;
+//extern char* dvdsub_lang;	//for -alang, don't remove it
 
 typedef enum
 {
@@ -58,11 +59,10 @@
 	AUDIO_MP2   	= 0x50,
 	AUDIO_A52   	= 0x2000,
 	AUDIO_LPCM_BE  	= 0x10001,
-	AUDIO_AAC	= (('A' << 24) | ('4' << 16) | ('P' << 8) | 'M')
-	/*,
+	AUDIO_AAC	= mmioFOURCC('M', 'P', '4', 'A'),
+
 	SPU_DVD		= 0x3000000,
-	SPU_DVB		= 0x3000001,
-	*/
+	SPU_DVB		= 0x3000001
 } es_stream_type_t;
 
 
@@ -74,6 +74,7 @@
 	float pts, last_pts;
 	int pid;
 	int last_cc;				// last cc code (-1 if first packet)
+	uint64_t seen;
 } ES_stream_t;
 
 
@@ -106,7 +107,7 @@
 	} *progs;
 	uint16_t progs_cnt;
 	char buffer[65535];
-	uint8_t buffer_len;
+	uint16_t buffer_len;
 	} pat_t;
 
 typedef struct {
@@ -122,12 +123,14 @@
 	uint16_t PCR_PID;
 	uint16_t prog_descr_length;
 	char buffer[2048];
-	uint8_t buffer_len;
+	uint16_t buffer_len;
 	uint16_t es_cnt;
 	struct pmt_es_t {
 		uint16_t pid;
 		uint32_t type;	//it's 8 bit long, but cast to the right type as FOURCC
 		uint16_t descr_length;
+		uint8_t format_descriptor[5];
+		uint8_t lang[4];
 	} *es;
 } pmt_t;
 
@@ -138,7 +141,7 @@
 	int last_pid;
 	int is_start;
 	int eof;
-	av_fifo_t fifo[2];	//0 for audio, 1 for video
+	av_fifo_t fifo[3];	//0 for audio, 1 for video
 	pat_t pat;
 	pmt_t *pmt;
 	uint16_t pmt_cnt;
@@ -184,10 +187,11 @@
 	uint32_t _read, i, count = 0, is_ts;
 	int cc[NB_PID_MAX], last_cc[NB_PID_MAX], pid, cc_ok, c, good, bad;
 	uint8_t size = 0;
-	off_t pos = 0;
+	off_t pos = 0, init_pos;
 
 	mp_msg(MSGT_DEMUX, MSGL_V, "Checking for MPEG-TS...\n");
 
+	init_pos = stream_tell(demuxer->stream);
 	is_ts = 0;
 	while(! done)
 	{
@@ -227,14 +231,14 @@
 			is_ts = 1;
 		}
 
-		if(pos >= MAX_CHECK_SIZE)
+		if(pos - init_pos >= MAX_CHECK_SIZE)
 		{
 			done = 1;
 			is_ts = 0;
 		}
 	}
 
-	mp_msg(MSGT_DEMUX, MSGL_V, "TRIED UP TO POSITION %u, FOUND %x, packet_size= %d\n", pos, c, size);
+	mp_msg(MSGT_DEMUX, MSGL_V, "TRIED UP TO POSITION %llu, FOUND %x, packet_size= %d, SEEMS A TS? %d\n", pos, c, size, is_ts);
 	stream_seek(demuxer->stream, pos);
 
 	if(! is_ts)
@@ -326,12 +330,12 @@
 }
 
 
-static void ts_detect_streams(demuxer_t *demuxer, uint32_t *a,  uint32_t *v, int *fapid, int *fvpid, int32_t *prog)
+static off_t ts_detect_streams(demuxer_t *demuxer, uint32_t *a,  uint32_t *v, uint32_t *s, int *fapid, int *fvpid, int *fspid, int32_t *prog)
 {
-	int video_found = 0, audio_found = 0, i, num_packets = 0, req_apid, req_vpid;
-	int is_audio, is_video, has_tables;
+	int video_found = 0, audio_found = 0, sub_found = 0, i, num_packets = 0, req_apid, req_vpid, req_spid;
+	int is_audio, is_video, is_sub, has_tables;
 	int32_t p, chosen_pid;
-	off_t pos=0;
+	off_t pos=0, ret = 0, init_pos;
 	ES_stream_t es;
 	unsigned char tmp[TS_FEC_PACKET_SIZE];
 	ts_priv_t *priv = (ts_priv_t*) demuxer->priv;
@@ -344,18 +348,22 @@
 
 	req_apid = *fapid;
 	req_vpid = *fvpid;
+	req_spid = *fspid;
 
 	has_tables = 0;
-	mp_msg(MSGT_DEMUXER, MSGL_INFO, "PROBING UP TO %u, PROG: %d\n", MAX_PROBE_SIZE, *prog);
-	while(pos <= MAX_PROBE_SIZE)
+	init_pos = stream_tell(demuxer->stream);
+	mp_msg(MSGT_DEMUXER, MSGL_INFO, "PROBING UP TO %llu, PROG: %d\n", ts_probe, *prog);
+	while(pos <= init_pos + ts_probe)
 	{
 		pos = stream_tell(demuxer->stream);
 		if(ts_parse(demuxer, &es, tmp, 1))
 		{
 			is_audio = ((es.type == AUDIO_MP2) || (es.type == AUDIO_A52) || (es.type == AUDIO_LPCM_BE) || (es.type == AUDIO_AAC));
 			is_video = ((es.type == VIDEO_MPEG1) || (es.type == VIDEO_MPEG2) || (es.type == VIDEO_MPEG4));
+			is_sub   = ((es.type == SPU_DVD) || (es.type == SPU_DVB));
+
 
-			if((! is_audio) && (! is_video))
+			if((! is_audio) && (! is_video) && (! is_sub))
 				continue;
 
 			if(is_video)
@@ -370,10 +378,23 @@
 				if((! chosen_pid) && (req_apid > 0))
 					continue;
 			}
+			else if(is_sub)
+			{
+				chosen_pid = (req_spid == es.pid);
+				if((! chosen_pid) && (req_spid > 0))
+					continue;
+			}
+
 
-			if(req_vpid < 0 && req_apid < 0)
+
+			if(req_apid < 0 && req_vpid < 0 && req_spid < 0)
 				chosen_pid = 1;
 
+			if((ret == 0) && chosen_pid)
+			{
+				ret = stream_tell(demuxer->stream);
+			}
+
 			p = progid_for_pid(priv, es.pid, *prog);
 			if(p != -1)
 				has_tables++;
@@ -408,7 +429,6 @@
 					}
 				}
 
-
 				continue;
 			}
 
@@ -434,6 +454,15 @@
 				break;
 			}
 
+			if(is_sub)
+			{
+				if((req_spid == -1) || (req_spid == es.pid))
+				{
+					*s = es.type;
+					*fspid = es.pid;
+					sub_found = 1;
+				}
+			}
 
 			if(is_audio)
 			{
@@ -459,12 +488,15 @@
 		}
 	}
 
+	priv->prog = *prog;
+
 	if(video_found)
 		mp_msg(MSGT_DEMUXER, MSGL_INFO, "VIDEO MPEG%d(pid=%d)...", (*v == VIDEO_MPEG1 ? 1 : (*v == VIDEO_MPEG2 ? 2 : 4)), *fvpid);
 	else
 	{
-	    //WE DIDN'T MATCH ANY VIDEO STREAM
-	    mp_msg(MSGT_DEMUXER, MSGL_INFO, "NO VIDEO! ");
+		video_found = 0;
+		//WE DIDN'T MATCH ANY VIDEO STREAM
+		mp_msg(MSGT_DEMUXER, MSGL_INFO, "NO VIDEO! ");
 	}
 
 	if(*a == AUDIO_MP2)
@@ -477,11 +509,21 @@
 		mp_msg(MSGT_DEMUXER, MSGL_INFO, "AUDIO AAC(pid=%d)", *fapid);
 	else
 	{
+		audio_found = 0;
 		//WE DIDN'T MATCH ANY AUDIO STREAM, SO WE FORCE THE DEMUXER TO IGNORE AUDIO
 		mp_msg(MSGT_DEMUXER, MSGL_INFO, "NO AUDIO! ");
 	}
 
-	mp_msg(MSGT_DEMUXER, MSGL_INFO, " PROGRAM N. %d\n", *prog);
+	if(*s == SPU_DVD || *s == SPU_DVB)
+		mp_msg(MSGT_DEMUXER, MSGL_INFO, " SUB DVx(pid=%d) ", *fspid);
+	else
+		mp_msg(MSGT_DEMUXER, MSGL_INFO, " NO SUBS (yet)! ");
+
+	if(video_found || audio_found)
+		mp_msg(MSGT_DEMUXER, MSGL_INFO, " PROGRAM N. %d\n", *prog);
+	else
+		mp_msg(MSGT_DEMUXER, MSGL_INFO, "\n");
+
 
 	for(i=0; i<8192; i++)
 	{
@@ -489,9 +531,12 @@
 		{
 			priv->ts.pids[i]->payload_size = 0;
 			priv->ts.pids[i]->pts = priv->ts.pids[i]->last_pts = 0;
+			priv->ts.pids[i]->seen = 0;
 			//priv->ts.pids[i]->type = UNKNOWN;
 		}
 	}
+
+	return ret;
 }
 
 
@@ -502,11 +547,12 @@
 	uint8_t packet_size;
 	sh_video_t *sh_video;
 	sh_audio_t *sh_audio;
-	uint32_t at = 0, vt = 0;
+	uint32_t at = 0, vt = 0, st = 0;
+	off_t start_pos;
 	ts_priv_t * priv = (ts_priv_t*) demuxer->priv;
 	demuxer_t *od;
 
-	mp_msg(MSGT_DEMUX, MSGL_DBG2, "DEMUX OPEN, AUDIO_ID: %d, VIDEO_ID: %d, SUBTITLE_ID: %d,\n",
+	mp_msg(MSGT_DEMUX, MSGL_INFO, "DEMUX OPEN, AUDIO_ID: %d, VIDEO_ID: %d, SUBTITLE_ID: %d,\n",
 		demuxer->audio->id, demuxer->video->id, demuxer->sub->id);
 
 
@@ -514,7 +560,7 @@
 
 
 	stream_reset(demuxer->stream);
-	stream_seek(demuxer->stream, 0);
+	//stream_seek(demuxer->stream, 0);
 
 	packet_size = ts_check_file(demuxer);
 	if(!packet_size)
@@ -540,14 +586,14 @@
 
 
 	demuxer->priv = priv;
+
 	if(demuxer->stream->type != STREAMTYPE_FILE)
 		demuxer->seekable = 0;
 	else
 		demuxer->seekable = 1;
 
-	stream_seek(demuxer->stream, 0);	//IF IT'S FROM A PIPE IT WILL FAIL, BUT WHO CARES?
-	ts_detect_streams(demuxer, &at, &vt, &demuxer->audio->id, &demuxer->video->id, &ts_prog);
-	mp_msg(MSGT_DEMUXER,MSGL_INFO, "Opened TS demuxer, audio: %x(pid %d), video: %x(pid %d)...\n", at, demuxer->audio->id, vt, demuxer->video->id);
+
+	start_pos = ts_detect_streams(demuxer, &at, &vt, &st, &demuxer->audio->id, &demuxer->video->id, &demuxer->sub->id, &ts_prog);
 
 
 	if(vt)
@@ -559,8 +605,6 @@
 		sh_video->ds = demuxer->video;
 		sh_video->format = vt;
 		demuxer->video->sh = sh_video;
-
-		mp_msg(MSGT_DEMUXER,MSGL_INFO, "OPENED_SH_VIDEO\n");
 	}
 
 	if(at)
@@ -569,20 +613,15 @@
 		sh_audio->ds = demuxer->audio;
 		sh_audio->format = at;
 		demuxer->audio->sh = sh_audio;
-
-		mp_msg(MSGT_DEMUXER,MSGL_INFO, "OPENED_SH_AUDIO\n");
 	}
 
 
-	mp_msg(MSGT_DEMUXER,MSGL_INFO, "Opened TS demuxer2\n");
+	mp_msg(MSGT_DEMUXER,MSGL_INFO, "Opened TS demuxer, audio: %x(pid %d), video: %x(pid %d)...POS=%llu\n", at, demuxer->audio->id, vt, demuxer->video->id, start_pos);
 
-	/*
-	demuxer->movi_start = 0;
-	demuxer->movi_end = demuxer->stream->end_pos;
-	*/
-
-	stream_seek(demuxer->stream, 0);	//IF IT'S FROM A PIPE IT WILL FAIL, BUT WHO CARES?
 
+	start_pos = (start_pos <= priv->ts.packet_size ? 0 : start_pos - priv->ts.packet_size);
+	demuxer->movi_start = start_pos;
+	stream_seek(demuxer->stream, start_pos);	//IF IT'S FROM A PIPE IT WILL FAIL, BUT WHO CARES?
 
 
 	priv->is_synced = 0;
@@ -590,7 +629,7 @@
 	priv->last_pid = 8192;		//invalid pid
 	priv->is_start = 0;
 
-	for(i=0; i< 2; i++)
+	for(i = 0; i < 3; i++)
 	{
 		priv->fifo[i].pack  = NULL;
 		priv->fifo[i].offset = 0;
@@ -598,9 +637,11 @@
 	}
 	priv->fifo[0].ds = demuxer->audio;
 	priv->fifo[1].ds = demuxer->video;
+	priv->fifo[2].ds = demuxer->sub;
 
 	priv->fifo[0].buffer_size = 1536;
 	priv->fifo[1].buffer_size = 32767;
+	priv->fifo[2].buffer_size = 32767;
 	priv->eof = 0;
 
 	priv->pat.buffer_len = 0;
@@ -610,10 +651,6 @@
 }
 
 
-
-
-
-
 void demux_close_ts(demuxer_t * demuxer)
 {
 	if(demuxer->priv)
@@ -625,8 +662,6 @@
 
 
 
-
-
 static int pes_parse2(unsigned char *buf, uint16_t packet_len, ES_stream_t *es, int32_t type_from_pmt)
 {
 	unsigned char  *p;
@@ -741,22 +776,22 @@
 			p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[0] & 0x80);
 
 		track = p[0] & 0x0F;
-		mp_msg(MSGT_DEMUX, MSGL_DBG2, "AC3 TRACK: %d\n", track);
+		mp_msg(MSGT_DEMUX, MSGL_DBG2, "A52 TRACK: %d\n", track);
 
 
 		/*
 		* we check the descriptor tag first because some stations
-		* do not include any of the ac3 header info in their audio tracks
+		* do not include any of the A52 header info in their audio tracks
 		* these "raw" streams may begin with a byte that looks like a stream type.
 		*/
 
 
 		if(
-			(type_from_pmt == AUDIO_A52) ||		 /* ac3 - raw */
-			(p[0] == 0x0B && p[1] == 0x77)		/* ac3 - syncword */
+			(type_from_pmt == AUDIO_A52) ||		 /* A52 - raw */
+			(p[0] == 0x0B && p[1] == 0x77)		/* A52 - syncword */
 		)
 		{
-			mp_msg(MSGT_DEMUX, MSGL_DBG2, "AC3 RAW OR SYNCWORD\n");
+			mp_msg(MSGT_DEMUX, MSGL_DBG2, "A52 RAW OR SYNCWORD\n");
 			es->start = p;
 			es->size  = packet_len;
 			es->type  = AUDIO_A52;
@@ -764,35 +799,31 @@
 
 			return es->size;
 		}
-		/*
-		SUBS, it seems they are not streams in g1, what to do?
-		else if (//m->descriptor_tag == 0x06 &&
-		p[0] == 0x20 && p[1] == 0x00)
+		/* SPU SUBS */
+		else if(type_from_pmt == SPU_DVB ||
+		(p[0] == 0x20)) // && p[1] == 0x00))
 		{
-			// DVBSUB
 			long payload_len = ((buf[4] << 8) | buf[5]) - header_len - 3;
 			es->start = p;
 			es->size  = packet_len;
-			es->type  = SPU_DVB + payload_len;
+			es->type  = SPU_DVB;
 			es->payload_size -= packet_len;
 
 			return es->size;
 		}
-
-		else if ((p[0] & 0xE0) == 0x20)
+		else if((p[0] & 0xE0) == 0x20)	//SPU_DVD
 		{
-			spu_id      = (p[0] & 0x1f);
+			//printf("DVD SUBS\n");
 			es->start   = p+1;
 			es->size    = packet_len-1;
-			es->type    = SPU_DVD + spu_id;
+			es->type    = SPU_DVD;
 			es->payload_size -= packet_len;
 
 			return es->size;
 		}
-		*/
-		else if ((p[0] & 0xF0) == 0x80)
+		else if((p[0] & 0xF0) == 0x80)
 		{
-			mp_msg(MSGT_DEMUX, MSGL_DBG2, "AC3 WITH HEADER\n");
+			mp_msg(MSGT_DEMUX, MSGL_DBG2, "A52 WITH HEADER\n");
 			es->start   = p+4;
 			es->size    = packet_len - 4;
 			es->type    = AUDIO_A52;
@@ -800,7 +831,7 @@
 
 			return es->size;
 		}
-		else if ((p[0]&0xf0) == 0xa0)
+		else if((p[0] & 0xf0) == 0xa0)
 		{
 			int pcm_offset;
 
@@ -821,7 +852,7 @@
 			return es->size;
 		}
 	}
-	else if ((stream_id >= 0xbc) && ((stream_id & 0xf0) == 0xe0))
+	else if((stream_id >= 0xbc) && ((stream_id & 0xf0) == 0xe0))
 	{
 		es->start   = p;
 		es->size    = packet_len;
@@ -831,7 +862,7 @@
 
 		return es->size;
 	}
-	else if ((stream_id == 0xfa))
+	else if((stream_id == 0xfa))
 	{
 		if(type_from_pmt != -1)	//MP4 A/V
 		{
@@ -844,7 +875,7 @@
 			return es->size;
 		}
 	}
-	else if ((stream_id & 0xe0) == 0xc0)
+	else if((stream_id & 0xe0) == 0xc0)
 	{
 		int track;
 
@@ -856,7 +887,7 @@
 
 		return es->size;
 	}
-	else if (type_from_pmt != -1)	//as a last resort here we trust the PMT, if present
+	else if(type_from_pmt != -1)	//as a last resort here we trust the PMT, if present
 	{
 		es->start   = p;
 		es->size    = packet_len;
@@ -865,7 +896,6 @@
 
 		return es->size;
 	}
-
 	else
 	{
 		mp_msg(MSGT_DEMUX, MSGL_DBG2, "pes_parse2: unknown packet, id: %x\n", stream_id);
@@ -1054,7 +1084,7 @@
 
 static inline int32_t es_pid_in_pmt(pmt_t * pmt, uint16_t pid)
 {
-	int i;
+	uint16_t i;
 
 	if(pmt == NULL)
 		return -1;
@@ -1065,13 +1095,109 @@
 	for(i = 0; i < pmt->es_cnt; i++)
 	{
 		if(pmt->es[i].pid == pid)
-			return i;
+		{
+			return (int32_t) i;
+		}
 	}
 
 	return -1;
 }
 
 
+static int parse_descriptors(struct pmt_es_t *es, uint8_t *ptr)
+{
+	int j, descr_len, len;
+
+	j = 0;
+	len = es->descr_length;
+	while(len > 2)
+	{
+		descr_len = ptr[j+1];
+		mp_msg(MSGT_DEMUX, MSGL_DBG2, "...descr id: 0x%x, len=%d\n", ptr[j], descr_len);
+		if(descr_len > len)
+		{
+			mp_msg(MSGT_DEMUX, MSGL_DBG2, "INVALID DESCR LEN: %d vs %d max, EXIT LOOP\n", descr_len, len);
+			return -1;
+		}
+
+
+		if(ptr[j] == 0x6a)	//A52 Descriptor
+		{
+			es->type = AUDIO_A52;
+			mp_msg(MSGT_DEMUX, MSGL_DBG2, "DVB A52 Descriptor\n");
+		}
+		else if(ptr[j] == 0x59)	//Subtitling Descriptor
+		{
+			uint8_t subtype;
+
+			mp_msg(MSGT_DEMUX, MSGL_DBG2, "Subtitling Descriptor\n");
+			if(descr_len < 8)
+			{
+				mp_msg(MSGT_DEMUX, MSGL_DBG2, "Descriptor length too short for DVB Subtitle Descriptor: %d, SKIPPING\n", descr_len);
+			}
+			else
+			{
+				memcpy(es->lang, &ptr[j+2], 3);
+				es->lang[3] = 0;
+				subtype = ptr[j+5];
+				if(
+					(subtype >= 0x10 && subtype <= 0x13) ||
+					(subtype >= 0x20 && subtype <= 0x23)
+				)
+				{
+					es->type = SPU_DVB;
+					//page parameters: compo page 2 bytes, ancillary page 2 bytes
+				}
+				else
+					es->type = UNKNOWN;
+			}
+		}
+		else if(ptr[j] == 0x50)	//Component Descriptor
+		{
+			mp_msg(MSGT_DEMUX, MSGL_DBG2, "Component Descriptor\n");
+			memcpy(es->lang, &ptr[j+5], 3);
+			es->lang[3] = 0;
+		}
+		else if(ptr[j] == 0xa)	//Language Descriptor
+		{
+			mp_msg(MSGT_DEMUX, MSGL_DBG2, "Language Descriptor\n");
+			memcpy(es->lang, &ptr[j+2], 3);
+			es->lang[3] = 0;
+		}
+		else if(ptr[j] == 0x5)	//Registration Descriptor (looks like e fourCC :) )
+		{
+			mp_msg(MSGT_DEMUX, MSGL_DBG2, "Registration Descriptor\n");
+			if(descr_len < 4)
+			{
+				mp_msg(MSGT_DEMUX, MSGL_DBG2, "Registration Descriptor length too short: %d, SKIPPING\n", descr_len);
+			}
+			else
+			{
+				char *d;
+				memcpy(es->format_descriptor, &ptr[j+2], 4);
+				es->format_descriptor[4] = 0;
+
+				d = &ptr[j+2];
+				if(d[0] == 'A' && d[1] == 'C' && d[2] == '-' && d[3] == '3')
+				{
+					es->type = AUDIO_A52;
+				}
+				else
+					es->type = UNKNOWN;
+				mp_msg(MSGT_DEMUX, MSGL_DBG2, "FORMAT %s\n", es->format_descriptor);
+			}
+		}
+		else
+			mp_msg(MSGT_DEMUX, MSGL_DBG2, "Unknown descriptor 0x%x, SKIPPING\n", ptr[j]);
+
+		len -= 2 + descr_len;
+		j += 2 + descr_len;
+	}
+
+	return 1;
+}
+
+
 
 static int parse_pmt(ts_priv_t * priv, uint16_t progid, uint16_t pid, int is_start, unsigned char *buff, int size)
 {
@@ -1132,8 +1258,8 @@
 	pmt->buffer_len += size - m;
 
 
-	mp_msg(MSGT_DEMUX, MSGL_V, "FILL_PMT(prog=%d), PMT_len: %d, IS_START: %d, TSPID: %d\n",
-		progid, pmt->buffer_len, is_start, pid);
+	mp_msg(MSGT_DEMUX, MSGL_V, "FILL_PMT(prog=%d), PMT_len: %d, IS_START: %d, TS_PID: %d, SIZE=%d, M=%d\n",
+		progid, pmt->buffer_len, is_start, pid, size, m);
 
 	base = pmt->buffer;
 
@@ -1156,7 +1282,9 @@
 
 	if(pmt->section_length + 3 > pmt->buffer_len)
 	{
-		mp_msg(MSGT_DEMUX, MSGL_V, "PARSE_PMT, SECTION LENGTH TOO LARGE FOR CURRENT BUFFER (%d vs %d), NEXT TIME\n", pmt->section_length, pmt->buffer_len);
+		mp_msg(MSGT_DEMUX, MSGL_V, "PARSE_PMT, SECTION LENGTH TOO LARGE FOR CURRENT BUFFER (%d vs %d), NEXT TIME\n",
+			pmt->section_length, pmt->buffer_len);
+
 		return -1;
 	}
 
@@ -1174,7 +1302,7 @@
 
 	while(section_bytes >= 5)
 	{
-		int es_pid, es_type;
+		int es_pid, es_type, k;
 
 		es_type = es_base[0];
 		es_pid = ((es_base[1] & 0x1f) << 8) | es_base[2];
@@ -1189,7 +1317,9 @@
 				mp_msg(MSGT_DEMUX, MSGL_ERR, "PARSE_PMT, COULDN'T ALLOCATE %d bytes for PMT_ES\n", sz);
 				continue;
 			}
+
 			idx = pmt->es_cnt;
+			memset(&(pmt->es[idx]), 0, sizeof(struct pmt_es_t));
 			pmt->es_cnt++;
 		}
 
@@ -1198,8 +1328,8 @@
 
 		if(pmt->es[idx].descr_length > section_bytes - 5)
 		{
-			mp_msg(MSGT_DEMUX, MSGL_ERR, "PARSE_PMT, ES_DESCR_LENGTH TOO LARGE %d > %d, EXIT %d bytes for PMT_ES\n",
-				pmt->es[idx].descr_length, section_bytes - 5, section_bytes);
+			mp_msg(MSGT_DEMUX, MSGL_ERR, "PARSE_PMT, ES_DESCR_LENGTH TOO LARGE %d > %d, EXIT\n",
+				pmt->es[idx].descr_length, section_bytes - 5);
 			return -1;
 		}
 
@@ -1207,6 +1337,8 @@
 		pmt->es[idx].pid = es_pid;
 		pmt->es[idx].type = es_type;
 
+		pmt->es[idx].type = UNKNOWN;
+
 		switch(es_type)
 		{
 			case 1:
@@ -1217,17 +1349,14 @@
 				break;
 			case 3:
 			case 4:
+				parse_descriptors(&pmt->es[idx], &es_base[5]);
 				pmt->es[idx].type = AUDIO_MP2;
 				break;
 			case 6:
-			{
-				int j;
-				for(j = 5; j < pmt->es[idx].descr_length; j += es_base[j+1] + 2)	//possible DVB-AC3
-					if(es_base[j] == 0x6a)
-						pmt->es[idx].type = AUDIO_A52;
-			}
-			break;
-
+				parse_descriptors(&pmt->es[idx], &es_base[5]);
+				if(pmt->es[idx].type == 0x6)
+					pmt->es[idx].type = UNKNOWN;
+				break;
 			case 0x10:
 				pmt->es[idx].type = VIDEO_MPEG4;
 				break;
@@ -1238,6 +1367,19 @@
 			case 0x81:
 				pmt->es[idx].type = AUDIO_A52;
 				break;
+
+			default:
+			{
+				if(es_type > 0x80)
+				{
+					parse_descriptors(&pmt->es[idx], &es_base[5]);
+				}
+				else
+				{
+					mp_msg(MSGT_DEMUX, MSGL_DBG2, "UNKNOWN ES TYPE=0x%x\n", es_type);
+					pmt->es[idx].type = UNKNOWN;
+				}
+			}
 		}
 
 
@@ -1251,10 +1393,27 @@
 		es_count++;
 	}
 
+	mp_msg(MSGT_DEMUX, MSGL_V, "----------------------------\n");
 	return 1;
 }
 
 
+static inline int32_t pid_type_from_pmt(ts_priv_t *priv, int pid)
+{
+	int32_t pmt_idx, pid_idx, pid_type;
+
+	pid_type = UNKNOWN;
+	pmt_idx = progid_idx_in_pmt(priv, priv->prog);
+	if(pmt_idx != -1)
+	{
+		pid_idx = es_pid_in_pmt(&(priv->pmt[pmt_idx]), pid);
+		if(pid_idx != -1)
+			pid_type = priv->pmt[pmt_idx].es[pid_idx].type;
+	}
+
+	return pid_type;
+}
+
 // 0 = EOF or no stream found
 // else = [-] number of bytes written to the packet
 static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet, int probe)
@@ -1262,7 +1421,8 @@
 	ES_stream_t *tss;
 	uint8_t done = 0;
 	int buf_size, is_start;
-	int len, pid, cc, cc_ok, afc, _read;
+	int len, cc, cc_ok, afc, _read;
+	int pid;
 	ts_priv_t * priv = (ts_priv_t*) demuxer->priv;
 	stream_t *stream = demuxer->stream;
 	char *p, tmp[TS_FEC_PACKET_SIZE];
@@ -1323,8 +1483,8 @@
 			tss->last_cc = -1;
 			tss->type = UNKNOWN;
 			tss->payload_size = 0;
-			priv->ts.pids[pid] 	= tss;
-			mp_msg(MSGT_DEMUX, MSGL_INFO, "\nNew TS pid=%u\n", pid);
+			tss->seen = 0;
+			priv->ts.pids[pid] = tss;
 		}
 
 
@@ -1374,6 +1534,9 @@
 			priv->last_afc = 0;
 		}
 
+		tss->seen++;
+		if(tss->seen == 16 && cc_ok)	//at least a complete round
+			mp_msg(MSGT_DEMUX, MSGL_V, "\nNew TS pid=%u\n", pid);
 		// PES CONTENT STARTS HERE
 
 		buf_size = priv->ts.packet_size - _read;
@@ -1403,6 +1566,12 @@
 
 		if(! probe)
 		{
+			pid_type = pid_type_from_pmt(priv, pid);
+			if((demuxer->video->id > 0) && (pid == demuxer->sub->id))
+			{
+				pid_type = SPU_DVD;
+			}
+
 			if(((tss->type == VIDEO_MPEG1) || (tss->type == VIDEO_MPEG2) || (tss->type == VIDEO_MPEG4))
 				&& (demuxer->video->id == tss->pid))
 			{
@@ -1423,6 +1592,43 @@
 				buffer_size = &priv->fifo[0].buffer_size;
 				broken = &priv->fifo[0].broken;
 			}
+			else if((tss->type == SPU_DVD) || (tss->type == SPU_DVB)
+				|| (pid_type == SPU_DVD) || (pid_type == SPU_DVB))
+			{
+				//SUBS are infrequent, so the initial detection may fail
+				// and we may need to add them at play-time
+				if(demuxer->sub->id == -1)
+				{
+					uint16_t p;
+					p = progid_for_pid(priv, tss->pid, priv->prog);
+
+					if(p == priv->prog)
+					{
+						demuxer->sub->id = tss->pid;
+						mp_msg(MSGT_DEMUX, MSGL_V, "CHOSEN SUBs pid 0x%x (%d) FROM PROG %d\n", tss->pid, tss->pid, priv->prog);
+					}
+					else
+					{
+						mp_msg(MSGT_DEMUX, MSGL_V, "DISCARDED SUBs pid 0x%x (%d) NOT CHOSEN OR NOT IN PROG %d\n", tss->pid, tss->pid, priv->prog);
+					}
+				}
+
+				if(demuxer->sub->id == tss->pid)
+				{
+					ds = demuxer->sub;
+
+					dp = &priv->fifo[2].pack;
+					dp_offset = &priv->fifo[2].offset;
+					buffer_size = &priv->fifo[2].buffer_size;
+					broken = &priv->fifo[2].broken;
+				}
+				else
+				{
+					stream_skip(stream, buf_size);
+					_read += buf_size;
+					continue;
+				}
+			}
 			else
 			{
 				stream_skip(stream, buf_size);
@@ -1443,7 +1649,7 @@
 					resize_demux_packet(*dp, ret);	//shrinked to the right size
 
 					ds_add_packet(ds, *dp);
-					mp_msg(MSGT_DEMUX, MSGL_V, "ADDED %d  bytes to %s fifo, PTS=%f\n", ret, (ds == demuxer->audio ? "audio" : "video"), (*dp)->pts);
+					mp_msg(MSGT_DEMUX, MSGL_V, "ADDED %d  bytes to %s fifo, PTS=%f\n", ret, (ds == demuxer->audio ? "audio" : (ds == demuxer->video ? "video" : "sub")), (*dp)->pts);
 
 
 					*dp = NULL;
@@ -1487,19 +1693,10 @@
 		{
 			mp_msg(MSGT_DEMUX, MSGL_DBG2, "IS_START\n");
 
-			//priv->is_synced = 0;
-
 			p = &packet[_read];
 			stream_read(stream, p, buf_size);
 			_read += buf_size;
 
-			pid_idx = es_pid_in_pmt(priv->pmt, pid);
-			if(pid_idx == -1)
-				pid_type = UNKNOWN;
-			else
-				pid_type = priv->pmt->es[pid_idx].type;
-
-
 			len = pes_parse2(p, buf_size, es, pid_type);
 
 			if(len)
@@ -1518,7 +1715,7 @@
 				else
 					tss->pts = tss->last_pts = es->pts;
 
-				mp_msg(MSGT_DEMUX, MSGL_DBG2, "ts_parse, NEW pid=%d, PSIZE: %u, type=%X, start=%X, len=%d\n",
+				mp_msg(MSGT_DEMUX, MSGL_V, "ts_parse, NEW pid=%d, PSIZE: %u, type=%X, start=%X, len=%d\n",
 					es->pid, es->payload_size, es->type, es->start, es->size);
 
 				tss->payload_size = es->payload_size;
@@ -1660,7 +1857,7 @@
 	int i, video_stats;
 
 	//================= seek in MPEG ==========================
-	off_t newpos = (flags&1)?demuxer->movi_start:demuxer->filepos;
+	off_t newpos = (flags&1) ? demuxer->movi_start : demuxer->filepos;
 
 	ts_dump_streams(demuxer->priv);
 	reset_fifos(priv, sh_audio != NULL, sh_video != NULL);
@@ -1684,7 +1881,7 @@
 
 
 	if(newpos<demuxer->movi_start)
-  		newpos = demuxer->movi_start = 0;	//begininng of stream
+  		newpos = demuxer->movi_start;	//begininng of stream
 
 #ifdef _LARGEFILE_SOURCE
 	newpos &= ~((long long) (STREAM_BUFFER_SIZE - 1));  /* sector boundary */