avformat/mpegts: Continue parsing PMTs until at least 2 streams are found or 100kb...
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Jan 2014 04:44:03 +0000 (05:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Jan 2014 04:44:03 +0000 (05:44 +0100)
This (ugly) hack fixes Ticket3348
If someone has an idea on how to fix this nicer, that would be very welcome
but the stream contains several PMTs with just one of the 2 streams at the start

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpegts.c

index db697e4..53de4ac 100644 (file)
@@ -1988,8 +1988,10 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet)
                     break;
             }
             if (i == ts->nb_prg && ts->nb_prg > 0) {
-                av_log(ts->stream, AV_LOG_DEBUG, "All programs have pmt, headers found\n");
-                ts->stream->ctx_flags &= ~AVFMTCTX_NOHEADER;
+                if (ts->stream->nb_streams > 1 || pos > 100000) {
+                    av_log(ts->stream, AV_LOG_DEBUG, "All programs have pmt, headers found\n");
+                    ts->stream->ctx_flags &= ~AVFMTCTX_NOHEADER;
+                }
             }
         }