Signed-off-by: Nicolas George <geo...@nsup.org>
---
libavformat/mpegts.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Untested. Offending commit was:
commit df8aa4598c7cc1c2f863f6fc6b2d4b3e6dc7345e
Author: Martin Storsjö <mar...@martin.st>
Date: 2012-04-21 20:44:24 +0300
mpegts: Make sure we don't return uninitialized packets
This fixes crashes, where the demuxer could return 0 even
if the returned AVPacket isn't initialized at all. This
could happen if running into EOF or running out of probesize
with non-seekable sources.
Signed-off-by: Martin Storsjö <mar...@martin.st>
Truncated input is usually treated as INVALIDDATA if not just EOF.
EINTR is wrong anyway.
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index bc1e03e..c522c6d 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -2670,7 +2670,7 @@ static int mpegts_read_packet(AVFormatContext *s,
AVPacket *pkt)
}
if (!ret && pkt->size < 0)
- ret = AVERROR(EINTR);
+ ret = AVERROR_INVALIDDATA;
return ret;
}
--
2.6.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
