From 41ad87ad8efe53af1422a0b3abde3d01e470447c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 8 Nov 2014 21:25:52 +0100 Subject: [PATCH] avformat/mpegts: improve first valid PMT heuristic This checks for audio+video instead of streams > 2 Fixes Ticket4090 Signed-off-by: Michael Niedermayer --- libavformat/mpegts.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index d8e75d9c09..97da0a3f57 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2207,7 +2207,12 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet) break; } if (i == ts->nb_prg && ts->nb_prg > 0) { - if (ts->stream->nb_streams > 1 || pos > 100000) { + int types = 0; + for (i = 0; i < ts->stream->nb_streams; i++) { + AVStream *st = ts->stream->streams[i]; + types |= 1<codec->codec_type; + } + if ((types & (1< 100000) { av_log(ts->stream, AV_LOG_DEBUG, "All programs have pmt, headers found\n"); ts->stream->ctx_flags &= ~AVFMTCTX_NOHEADER; }