[libav-stable] oma: properly forward errors in oma_read_packet

Luca Barbato git at libav.org
Tue May 7 14:56:25 CEST 2013


Module: libav
Branch: master
Commit: db9aee6ccf183508835acc325f5ad87d595eacc4

Author:    Luca Barbato <lu_zero at gentoo.org>
Committer: Luca Barbato <lu_zero at gentoo.org>
Date:      Tue May  7 09:39:10 2013 +0200

oma: properly forward errors in oma_read_packet

Prevent spurios EIO on EOF.

CC:libav-stable at libav.org

---

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

diff --git a/libavformat/omadec.c b/libavformat/omadec.c
index 06b6bc6..9452c61 100644
--- a/libavformat/omadec.c
+++ b/libavformat/omadec.c
@@ -395,8 +395,10 @@ static int oma_read_packet(AVFormatContext *s, AVPacket *pkt)
     int packet_size = s->streams[0]->codec->block_align;
     int ret = av_get_packet(s->pb, pkt, packet_size);
 
-    if (ret <= 0)
-        return AVERROR(EIO);
+    if (ret < 0)
+        return ret;
+    if (!ret)
+        return AVERROR_EOF;
 
     pkt->stream_index = 0;
 



More information about the libav-stable mailing list