Browse Source

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>
(cherry picked from commit 49ec0c818d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.8.6
Laurent Aimar Michael Niedermayer 14 years ago
parent
commit
feef77ec3a
1 changed files with 8 additions and 4 deletions
  1. +8
    -4
      libavformat/mpegts.c

+ 8
- 4
libavformat/mpegts.c View File

@@ -1083,7 +1083,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;
@@ -1403,11 +1403,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)
return ret;


Loading…
Cancel
Save