[FFmpeg-devel] [PATCH]lavf/dv: Do not return EIO for every error (like EOF)

Carl Eugen Hoyos cehoyos at ag.or.at
Tue Sep 1 11:41:16 CEST 2015


Hi!

Attached patch may fix ticket #4818 but I am not sure if I understand the 
ticket correctly...

Please review, Carl Eugen
-------------- next part --------------
diff --git a/libavformat/dv.c b/libavformat/dv.c
index 8500228..84c3061 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -553,12 +553,17 @@ static int dv_read_packet(AVFormatContext *s, AVPacket *pkt)
     size = avpriv_dv_get_packet(c->dv_demux, pkt);
 
     if (size < 0) {
+        int ret;
         int64_t pos = avio_tell(s->pb);
         if (!c->dv_demux->sys)
             return AVERROR(EIO);
         size = c->dv_demux->sys->frame_size;
-        if (avio_read(s->pb, c->buf, size) <= 0)
+        ret = avio_read(s->pb, c->buf, size);
+        if (ret < 0) {
+            return ret;
+        } else if (ret == 0) {
             return AVERROR(EIO);
+        }
 
         size = avpriv_dv_produce_packet(c->dv_demux, pkt, c->buf, size, pos);
     }


More information about the ffmpeg-devel mailing list