OSDN Git Service

oma: properly forward errors in oma_read_packet
authorLuca Barbato <lu_zero@gentoo.org>
Tue, 7 May 2013 07:39:10 +0000 (09:39 +0200)
committerLuca Barbato <lu_zero@gentoo.org>
Tue, 7 May 2013 12:37:32 +0000 (14:37 +0200)
Prevent spurios EIO on EOF.

CC:libav-stable@libav.org

libavformat/omadec.c

index 06b6bc6..9452c61 100644 (file)
@@ -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;