summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-06-02 07:30:19 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-06-02 07:30:19 +0000
commit617c461625daa5d569345df55e6cedc4b6100ec1 (patch)
treeb0e505ae2b7224bf7686b665797f62ee0b7661cb
parent1c4df2ab2436c68ccb00d0374fc4aab866b67308 (diff)
correctly handle maximum streams limit
Originally committed as revision 19074 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mpegts.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index d60a25ba4f..df281571b1 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -925,7 +925,8 @@ static int mpegts_push_data(MpegTSFilter *filter,
code = pes->header[3] | 0x100;
dprintf(pes->stream, "pid=%x pes_code=%#x\n", pes->pid, code);
- if ((pes->st && pes->st->discard == AVDISCARD_ALL) ||
+ if ((!pes->st && pes->stream->nb_streams == MAX_STREAMS) ||
+ (pes->st && pes->st->discard == AVDISCARD_ALL) ||
code == 0x1be) /* padding_stream */
goto skip;