diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-04 23:41:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-10 02:28:05 +0100 |
| commit | 806a66fd08a395486e763fb10588c5fd02e8d54e (patch) | |
| tree | aa7559adc5a57d9cb1bd0ab50bfb8e07220cc5e8 | |
| parent | 07ab8d3369b2fee9d3871a5f65313be5d9fe5c89 (diff) | |
| download | ffmpeg-806a66fd08a395486e763fb10588c5fd02e8d54e.tar.gz | |
mpegts: clear avprograms only for removed programs
Fixes Ticket2186
Requested-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mpegts.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index d639623f8b..391bf58f8d 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -209,9 +209,6 @@ static void clear_program(MpegTSContext *ts, unsigned int programid) 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); ts->nb_prg=0; } @@ -1638,6 +1635,17 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len 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) |