From: Anton Khirnov Date: Sat, 28 Jul 2012 10:21:21 +0000 (+0200) Subject: mp3dec: forward errors for av_get_packet(). X-Git-Tag: n1.0~12^2~653 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=f73e3938ac70524826664855210446c3739c4a5e;ds=inline mp3dec: forward errors for av_get_packet(). Don't invent a bogus EIO error. The code now doesn't check for ret == 0, but that check is redundant, av_get_packet() never returns 0. --- diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 11e684d7f3..a208488930 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -188,11 +188,10 @@ static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt) int ret; ret = av_get_packet(s->pb, pkt, MP3_PACKET_SIZE); + if (ret < 0) + return ret; pkt->stream_index = 0; - if (ret <= 0) { - return AVERROR(EIO); - } if (ret > ID3v1_TAG_SIZE && memcmp(&pkt->data[ret - ID3v1_TAG_SIZE], "TAG", 3) == 0)