summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-09-13 20:08:47 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-09-13 20:08:47 +0000
commit8bb7dda2f7e8cee4d3f7c755ec1d411cebe1327a (patch)
treecc4dba75caef9ec676bd1659551fb2e6129e5166
parent8956f68014b7ff2fdb529e7b9448d04876e8a006 (diff)
downloadffmpeg-streaming-8bb7dda2f7e8cee4d3f7c755ec1d411cebe1327a.zip
ffmpeg-streaming-8bb7dda2f7e8cee4d3f7c755ec1d411cebe1327a.tar.gz
ensure pes buffer is set to avoid segv
Originally committed as revision 19836 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mpegts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 90510de..92a29a3 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1027,7 +1027,7 @@ static int mpegts_push_data(MpegTSFilter *filter,
}
break;
case MPEGTS_PAYLOAD:
- if (buf_size > 0) {
+ if (buf_size > 0 && pes->buffer) {
if (pes->data_index+buf_size > pes->total_size) {
new_pes_packet(pes, ts->pkt);
pes->total_size = MAX_PES_PAYLOAD;
OpenPOWER on IntegriCloud