[FFmpeg-cvslog] mpegts: propagate avio EOF in read_packet()

Jindrich Makovicka git at videolan.org
Fri Apr 1 03:31:53 CEST 2011


ffmpeg | branch: master | Jindrich Makovicka <jindrich.makovicka at nangu.tv> | Thu Mar 31 16:58:50 2011 +0200| [e006d71fa849542eb27146efac629288703b3d75] | committer: Anton Khirnov

mpegts: propagate avio EOF in read_packet()

Allows distinguishing between EOF and IO error in read_packet return code.

Signed-off-by: Jindrich Makovicka <makovick at gmail.com>
Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e006d71fa849542eb27146efac629288703b3d75
---

 libavformat/mpegts.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index abdb000..62e9dcb 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1350,7 +1350,7 @@ static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size)
     for(;;) {
         len = avio_read(pb, buf, TS_PACKET_SIZE);
         if (len != TS_PACKET_SIZE)
-            return AVERROR(EIO);
+            return len < 0 ? len : AVERROR_EOF;
         /* check paquet sync byte */
         if (buf[0] != 0x47) {
             /* find a new packet start */



More information about the ffmpeg-cvslog mailing list