Module: libav Branch: release/9 Commit: 77a2f4cbcfc3ca29e128e830622fc8b6fc7676f6
Author: Luca Barbato <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Tue May 7 09:39:10 2013 +0200 oma: properly forward errors in oma_read_packet Prevent spurios EIO on EOF. CC:[email protected] (cherry picked from commit db9aee6ccf183508835acc325f5ad87d595eacc4) Signed-off-by: Reinhard Tartler <[email protected]> --- libavformat/omadec.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/omadec.c b/libavformat/omadec.c index f6b6f13..cd255c1 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -381,8 +381,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; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
