summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2010-08-09 23:21:08 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-08-09 23:21:08 +0000
commit6b2b337657f23a967bcdc35e1835ea3af21237ad (patch)
treedc9ae2e12167e215d6cdc3499003e4fa0743722c
parentbe73ba2fa4890b857d987b79958e46af8c5e545b (diff)
get rid of MAX_STREAMS limit in mpegts
Originally committed as revision 24753 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mpegts.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 27d13bcd9e..997b7686be 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -682,11 +682,15 @@ 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->stream->nb_streams == MAX_STREAMS) ||
- (pes->st && pes->st->discard == AVDISCARD_ALL) ||
+ if ((pes->st && pes->st->discard == AVDISCARD_ALL) ||
code == 0x1be) /* padding_stream */
goto skip;
+#if LIBAVFORMAT_VERSION_MAJOR < 53
+ if (!pes->st && pes->stream->nb_streams == MAX_STREAMS)
+ goto skip;
+#endif
+
/* stream not present in PMT */
if (!pes->st) {
pes->st = av_new_stream(ts->stream, pes->pid);