[FFmpeg-cvslog] lavf/rmdec: Do not return EIO on EOF.

Carl Eugen Hoyos git at videolan.org
Tue Aug 2 17:22:56 EEST 2016


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Aug  2 16:16:31 2016 +0200| [8ee113afa13846c48685a03d4a1b99f4700fd07a] | committer: Carl Eugen Hoyos

lavf/rmdec: Do not return EIO on EOF.

Reported-by: applemax82

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

 libavformat/rmdec.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 0d3b56f..d175862 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -1044,7 +1044,9 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
                     st = s->streams[i];
             }
 
-            if (len <= 0 || avio_feof(s->pb))
+            if (avio_feof(s->pb))
+                return AVERROR_EOF;
+            if (len <= 0)
                 return AVERROR(EIO);
 
             res = ff_rm_parse_packet (s, s->pb, st, st->priv_data, len, pkt,



More information about the ffmpeg-cvslog mailing list