[FFmpeg-cvslog] siff: signal EOF

Piotr Bandurski git at videolan.org
Thu Nov 22 00:06:10 CET 2012


ffmpeg | branch: master | Piotr Bandurski <ami_stuff at o2.pl> | Wed Nov 21 17:28:44 2012 +0100| [88161b2a5287080b6d463439ebd0d8aecf0b4cf4] | committer: Michael Niedermayer

siff: signal EOF

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/siff.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavformat/siff.c b/libavformat/siff.c
index 8e7e5c7..a834d4d 100644
--- a/libavformat/siff.c
+++ b/libavformat/siff.c
@@ -192,7 +192,7 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
 
     if (c->has_video){
         if (c->cur_frame >= c->frames)
-            return AVERROR(EIO);
+            return AVERROR_EOF;
         if (c->curstrm == -1){
             c->pktsize = avio_rl32(s->pb) - 4;
             c->flags = avio_rl16(s->pb);
@@ -229,7 +229,9 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
             c->cur_frame++;
     }else{
         size = av_get_packet(s->pb, pkt, c->block_align);
-        if(size <= 0)
+        if(!size)
+            return AVERROR_EOF;
+        if(size < 0)
             return AVERROR(EIO);
         pkt->duration = size;
     }



More information about the ffmpeg-cvslog mailing list