diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 13:41:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 13:41:45 +0200 |
| commit | f302ba4ddab75d217e1ed63d15a56ef4e6e799b3 (patch) | |
| tree | 33c1b4de23d79fe30c14036647970c0509d494c7 /libavformat | |
| parent | d13bc208da3b4a7d058d96fad884f272c9647eb9 (diff) | |
| parent | db9aee6ccf183508835acc325f5ad87d595eacc4 (diff) | |
| download | ffmpeg-f302ba4ddab75d217e1ed63d15a56ef4e6e799b3.tar.gz | |
Merge commit 'db9aee6ccf183508835acc325f5ad87d595eacc4'
* commit 'db9aee6ccf183508835acc325f5ad87d595eacc4':
oma: properly forward errors in oma_read_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/omadec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/omadec.c b/libavformat/omadec.c index 38e22da563..e571495c8d 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -400,8 +400,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; |