From: Nicolas George <nicolas.george@normalesup.org>
Date: Fri, 24 Jun 2011 10:02:41 +0000 (+0200)
Subject: ogg_read_packet: forward error code.
X-Git-Tag: rel20110916_inqubus2.b.0~6^2~209
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=392aa6e444f13aaddcf3d215b1058640a2ada846;p=coroid%2Fffmpeg_saccubus.git

ogg_read_packet: forward error code.
---

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 655da35dd..08de280c0 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -550,15 +550,16 @@ static int ogg_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     struct ogg *ogg;
     struct ogg_stream *os;
-    int idx = -1;
+    int idx = -1, ret;
     int pstart, psize;
     int64_t fpos, pts, dts;
 
     //Get an ogg packet
 retry:
     do{
-        if (ogg_packet (s, &idx, &pstart, &psize, &fpos) < 0)
-            return AVERROR(EIO);
+        ret = ogg_packet (s, &idx, &pstart, &psize, &fpos);
+        if (ret < 0)
+            return ret;
     }while (idx < 0 || !s->streams[idx]);
 
     ogg = s->priv_data;
@@ -572,8 +573,9 @@ retry:
     os->keyframe_seek = 0;
 
     //Alloc a pkt
-    if (av_new_packet (pkt, psize) < 0)
-        return AVERROR(EIO);
+    ret = av_new_packet (pkt, psize);
+    if (ret < 0)
+        return ret;
     pkt->stream_index = idx;
     memcpy (pkt->data, os->buf + pstart, psize);