aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-05-07 09:39:10 +0200
committerLuca Barbato <lu_zero@gentoo.org>2013-05-07 14:37:32 +0200
commitdb9aee6ccf183508835acc325f5ad87d595eacc4 (patch)
tree3b200d8fb0584ec9373d008cf3be11c805d9feba /libavformat
parent6f98508e2b86dcb79614d8c9b8e97c5e83a21cb0 (diff)
downloadffmpeg-db9aee6ccf183508835acc325f5ad87d595eacc4.tar.gz
oma: properly forward errors in oma_read_packet
Prevent spurios EIO on EOF. CC:libav-stable@libav.org
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/omadec.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/omadec.c b/libavformat/omadec.c
index 06b6bc6966..9452c61792 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;