diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-10-08 23:40:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-19 23:28:05 +0200 |
| commit | 49ec0c818dc3c1c293a582b57fb58ba611a10b32 (patch) | |
| tree | c7d09b98fd3b368e001be16c51bbbd80f1765614 /libavformat/mpegts.c | |
| parent | e662b263d9c500270a8f1dc7e1b81b51d5bdfd4e (diff) | |
| download | ffmpeg-49ec0c818dc3c1c293a582b57fb58ba611a10b32.tar.gz | |
mpegts: fix return value when enough ts packets have been parsed or when the first PMT has been seen.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 5196fab1e4..1d26c6c438 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1106,7 +1106,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len // stop parsing after pmt, we found header if (!ts->stream->nb_streams) - ts->stop_parse = 1; + ts->stop_parse = 2; for(;;) { st = 0; @@ -1462,11 +1462,15 @@ static int handle_packets(MpegTSContext *ts, int nb_packets) ts->stop_parse = 0; packet_num = 0; for(;;) { - if (ts->stop_parse>0) - break; packet_num++; - if (nb_packets != 0 && packet_num >= nb_packets) + if (nb_packets != 0 && packet_num >= nb_packets || + ts->stop_parse > 1) { + ret = AVERROR(EAGAIN); break; + } + if (ts->stop_parse > 0) + break; + ret = read_packet(s, packet, ts->raw_packet_size); if (ret != 0) break; |