RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

When new streams are detected, look for old filters and close them out. 

This avoids crashes seen when legitimate streams are found on PID 0x11 instead
of DVB SDT.
Fixes regression detailed in Roundup issue 138.

Originally committed as revision 11050 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Jeff Downs 2007-11-17 03:14:43 +00:00
parent e240f898ff
commit 28af284cfb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mpegts.c
View File

@ -588,11 +588,11 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
case STREAM_TYPE_AUDIO_AC3: case STREAM_TYPE_AUDIO_AC3:
case STREAM_TYPE_AUDIO_DTS: case STREAM_TYPE_AUDIO_DTS:
case STREAM_TYPE_SUBTITLE_DVB: case STREAM_TYPE_SUBTITLE_DVB:
if(ts->pids[pid]){ if(ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES){
assert(ts->pids[pid]->type == MPEGTS_PES);
pes= ts->pids[pid]->u.pes_filter.opaque; pes= ts->pids[pid]->u.pes_filter.opaque;
st= pes->st; st= pes->st;
}else{ }else{
if (ts->pids[pid]) mpegts_close_filter(ts, ts->pids[pid]); //wrongly added sdt filter probably
pes = add_pes_stream(ts, pid, pcr_pid, stream_type); pes = add_pes_stream(ts, pid, pcr_pid, stream_type);
if (pes) if (pes)
st = new_pes_av_stream(pes, 0); st = new_pes_av_stream(pes, 0);