aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-21 00:51:53 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-21 21:04:51 +0200
commit596762f0588bf6db31c98a6a64c68a9538cc4cdd (patch)
treeca6cd12e08fcf5730f932b0b7dc9456b4cf8ae05
parentd2c5904cab95cf064bbe885660eb2af0eaa89714 (diff)
downloadffmpeg-596762f0588bf6db31c98a6a64c68a9538cc4cdd.tar.gz
mp3demux: pass on error code on packet read.
Reported-by: Tanami, Ohad Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c83442b0571370b946d3f8bb85c46879d62ab10a)
-rw-r--r--libavformat/mp3dec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 47772a4998..5e3e3513ad 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 &&