diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-05 03:27:07 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-07-07 18:20:18 +0200 |
| commit | cb340ecd7d96a2933efdde16462df7bd6cf97dfe (patch) | |
| tree | 474e3ee9d98cc6b722d1dab9c257d02b166f5cdc /libavformat | |
| parent | b88bea1d6c8aa11cb4ea9d4ad90d80bd66776f24 (diff) | |
| download | ffmpeg-cb340ecd7d96a2933efdde16462df7bd6cf97dfe.tar.gz | |
mpegts: only reopen pmt_cb filter if its different from the previous.
Fixes Ticket2632
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b009267910df10c004b5f340a090d45da29089a0)
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mpegts.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 32aa51f97e..216e2f06f6 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1622,12 +1622,18 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len if (sid == 0x0000) { /* NIT info */ } else { + MpegTSFilter *fil = ts->pids[pmt_pid]; program = av_new_program(ts->stream, sid); program->program_num = sid; program->pmt_pid = pmt_pid; - if (ts->pids[pmt_pid]) - mpegts_close_filter(ts, ts->pids[pmt_pid]); - mpegts_open_section_filter(ts, pmt_pid, pmt_cb, ts, 1); + if (fil) + if ( fil->type != MPEGTS_SECTION + || fil->pid != pmt_pid + || fil->u.section_filter.section_cb != pmt_cb) + mpegts_close_filter(ts, ts->pids[pmt_pid]); + + if (!ts->pids[pmt_pid]) + mpegts_open_section_filter(ts, pmt_pid, pmt_cb, ts, 1); add_pat_entry(ts, sid); add_pid_to_pmt(ts, sid, 0); //add pat pid to program add_pid_to_pmt(ts, sid, pmt_pid); |