highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mpegts: clear avprograms only for removed programs

Browse Source 
Fixes Ticket2186

Requested-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 806a66fd08)
This commit is contained in:
Michael Niedermayer
2013-02-04 23:41:53 +01:00
committed by Carl Eugen Hoyos
parent 0b198e38c5
commit 0ec869527c
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/mpegts.c
View File

@@ -208,9 +208,6 @@ static void clear_program(MpegTSContext *ts, unsigned int programid)
static void clear_programs(MpegTSContext *ts) static void clear_programs(MpegTSContext *ts)
{ {
int i;
for(i=0; i<ts->nb_prg; i++)
clear_avprogram(ts, ts->prg[i].id);
av_freep(&ts->prg); av_freep(&ts->prg);
ts->nb_prg=0; ts->nb_prg=0;
} }
@@ -1636,6 +1633,17 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
add_pid_to_pmt(ts, sid, pmt_pid); add_pid_to_pmt(ts, sid, pmt_pid);
} }
} }
if (sid < 0) {
int i,j;
for (j=0; j<ts->stream->nb_programs; j++) {
for (i=0; i<ts->nb_prg; i++)
if (ts->prg[i].id == ts->stream->programs[j]->id)
break;
if (i==ts->nb_prg)
clear_avprogram(ts, ts->stream->programs[j]->id);
}
}
} }
static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len) static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len)