# HG changeset patch # User michael # Date 1180825486 0 # Node ID 4aafc6050f39de4431132514b6cb3e9fc7a0bd87 # Parent 495161f790939c640da40b0a20e40a372592de51 kill completely idiotic code which hides all but 2 streams diff -r 495161f79093 -r 4aafc6050f39 mpegts.c --- a/mpegts.c Sat Jun 02 21:48:49 2007 +0000 +++ b/mpegts.c Sat Jun 02 23:04:46 2007 +0000 @@ -88,7 +88,6 @@ int raw_packet_size; /** if true, all pids are analyzed to find streams */ int auto_guess; - int set_service_ret; /** compute exact PCR for each transport stream packet */ int mpeg2ts_compute_pcr; @@ -786,6 +785,9 @@ const uint8_t *p; int len, code; + if(!ts->pkt) + return; + if (is_start) { pes->state = MPEGTS_HEADER; pes->data_index = 0; @@ -1159,7 +1161,6 @@ static void set_service_cb(void *opaque, int ret) { MpegTSContext *ts = opaque; - ts->set_service_ret = ret; ts->stop_parse = 1; } @@ -1225,8 +1226,6 @@ /* normal demux */ if (!ts->auto_guess) { - ts->set_service_ret = -1; - /* first do a scaning to get all the services */ url_fseek(pb, pos, SEEK_SET); mpegts_scan_sdt(ts); @@ -1256,7 +1255,7 @@ } /* tune to first service found */ - for(i=0; inb_services && ts->set_service_ret; i++){ + for(i=0; inb_services; i++){ service = ts->services[i]; sid = service->sid; #ifdef DEBUG_SI @@ -1273,7 +1272,6 @@ } /* if could not find service, enable auto_guess */ - if (ts->set_service_ret != 0) ts->auto_guess = 1; #ifdef DEBUG_SI