OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6f98508
)
oma: properly forward errors in oma_read_packet
author
Luca Barbato
<lu_zero@gentoo.org>
Tue, 7 May 2013 07:39:10 +0000
(09:39 +0200)
committer
Luca 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
patch
|
blob
|
history
diff --git
a/libavformat/omadec.c
b/libavformat/omadec.c
index
06b6bc6
..
9452c61
100644
(file)
--- 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;