diff options
| author | Marton Balint <cus@passwd.hu> | 2022-06-14 00:32:05 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2022-06-20 23:36:37 +0200 |
| commit | 58df81b02779c9c87cbf5403cfdbb437d5344669 (patch) | |
| tree | 4fc8e7c0fe2ec4987e11ba8add77723ea9a9ea30 | |
| parent | 5468548d5e161d2e28a2611f8a9c14ebb164da42 (diff) | |
| download | ffmpeg-58df81b02779c9c87cbf5403cfdbb437d5344669.tar.gz | |
avformat/mpegts: remove obsolate hacks for detecting streams with bad PMTs
Ffmpeg/ffprobe/ffplay sets scan_all_pmts to 1 when finding the streams, that
should be enough to handle files for which some early PMTs miss some streams.
Fixes ticket #9782.
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | libavformat/mpegts.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 6e761c07f1..8a3436f2be 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2870,16 +2870,8 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet, int64_t pos) break; } if (i == ts->nb_prg && ts->nb_prg > 0) { - int types = 0; - for (i = 0; i < ts->stream->nb_streams; i++) { - AVStream *st = ts->stream->streams[i]; - if (st->codecpar->codec_type >= 0) - types |= 1<<st->codecpar->codec_type; - } - if ((types & (1<<AVMEDIA_TYPE_AUDIO) && types & (1<<AVMEDIA_TYPE_VIDEO)) || pos > 100000) { - av_log(ts->stream, AV_LOG_DEBUG, "All programs have pmt, headers found\n"); - ts->stream->ctx_flags &= ~AVFMTCTX_NOHEADER; - } + av_log(ts->stream, AV_LOG_DEBUG, "All programs have pmt, headers found\n"); + ts->stream->ctx_flags &= ~AVFMTCTX_NOHEADER; } } |