Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

kill completely idiotic code which hides all but 2 streams

Browse source 
Originally committed as revision 9177 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-06-02 23:04:46 +00:00
parent f7994861f3
commit b229219417
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libavformat/mpegts.c
View file

@ -88,7 +88,6 @@ struct MpegTSContext {
int raw_packet_size; int raw_packet_size;
/** if true, all pids are analyzed to find streams */ /** if true, all pids are analyzed to find streams */
int auto_guess; int auto_guess;
int set_service_ret;
/** compute exact PCR for each transport stream packet */ /** compute exact PCR for each transport stream packet */
int mpeg2ts_compute_pcr; int mpeg2ts_compute_pcr;
@ -786,6 +785,9 @@ static void mpegts_push_data(void *opaque,
const uint8_t *p; const uint8_t *p;
int len, code; int len, code;
if(!ts->pkt)
return;
if (is_start) { if (is_start) {
pes->state = MPEGTS_HEADER; pes->state = MPEGTS_HEADER;
pes->data_index = 0; pes->data_index = 0;
@ -1159,7 +1161,6 @@ static int mpegts_probe(AVProbeData *p)
static void set_service_cb(void *opaque, int ret) static void set_service_cb(void *opaque, int ret)
{ {
MpegTSContext *ts = opaque; MpegTSContext *ts = opaque;
ts->set_service_ret = ret;
ts->stop_parse = 1; ts->stop_parse = 1;
} }
@ -1225,8 +1226,6 @@ static int mpegts_read_header(AVFormatContext *s,
/* normal demux */ /* normal demux */
if (!ts->auto_guess) { if (!ts->auto_guess) {
ts->set_service_ret = -1;
/* first do a scaning to get all the services */ /* first do a scaning to get all the services */
url_fseek(pb, pos, SEEK_SET); url_fseek(pb, pos, SEEK_SET);
mpegts_scan_sdt(ts); mpegts_scan_sdt(ts);
@ -1256,7 +1255,7 @@ static int mpegts_read_header(AVFormatContext *s,
} }
/* tune to first service found */ /* tune to first service found */
for(i=0; i<ts->nb_services && ts->set_service_ret; i++){ for(i=0; i<ts->nb_services; i++){
service = ts->services[i]; service = ts->services[i];
sid = service->sid; sid = service->sid;
#ifdef DEBUG_SI #ifdef DEBUG_SI
@ -1273,7 +1272,6 @@ static int mpegts_read_header(AVFormatContext *s,
} }
/* if could not find service, enable auto_guess */ /* if could not find service, enable auto_guess */
if (ts->set_service_ret != 0)
ts->auto_guess = 1; ts->auto_guess = 1;
#ifdef DEBUG_SI #ifdef DEBUG_SI