aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2011-02-27 16:19:50 -0800
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2011-02-27 16:20:00 -0800
commit4ea02a9a71865d0e8b31b22e9bb68654c4800951 (patch)
tree523826c45697e007a36477bea148a6ad0b8dee21
parente9634db1dc7ac72b209d37ae78ab173c94632577 (diff)
downloadffmpeg-4ea02a9a71865d0e8b31b22e9bb68654c4800951.tar.gz
In mpegts demuxer, do not output known sized packet if an unbounded packet
is already queued. Fix issue #2624.
-rw-r--r--libavformat/mpegts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 3307685b41..5743ac84a2 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -809,7 +809,7 @@ static int mpegts_push_data(MpegTSFilter *filter,
* a couple of seconds to milliseconds for properly muxed files.
* total_size is the number of bytes following pes_packet_length
* in the pes header, i.e. not counting the first 6 bytes */
- if (pes->total_size < MAX_PES_PAYLOAD &&
+ if (!ts->stop_parse && pes->total_size < MAX_PES_PAYLOAD &&
pes->pes_header_size + pes->data_index == pes->total_size + 6) {
ts->stop_parse = 1;
new_pes_packet(pes, ts->pkt);