[FFmpeg-cvslog] mp3demux: pass on error code on packet read.

Michael Niedermayer git at videolan.org
Wed Sep 21 21:08:40 CEST 2011


ffmpeg | branch: release/0.8 | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 21 00:51:53 2011 +0200| [596762f0588bf6db31c98a6a64c68a9538cc4cdd] | committer: Michael Niedermayer

mp3demux: pass on error code on packet read.

Reported-by: Tanami, Ohad
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c83442b0571370b946d3f8bb85c46879d62ab10a)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=596762f0588bf6db31c98a6a64c68a9538cc4cdd
---

 libavformat/mp3dec.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 47772a4..5e3e351 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -173,7 +173,9 @@ static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt)
 
     pkt->stream_index = 0;
     if (ret <= 0) {
-        return AVERROR(EIO);
+        if(ret<0)
+            return ret;
+        return AVERROR_EOF;
     }
 
     if (ret > ID3v1_TAG_SIZE &&



More information about the ffmpeg-cvslog mailing list