diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-07-28 12:21:21 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-07-28 14:37:00 +0200 |
| commit | f73e3938ac70524826664855210446c3739c4a5e (patch) | |
| tree | 192a7bb4607291210fea343a57f9175d2fe248c9 /libavformat/mp3dec.c | |
| parent | 67b1156fe8d80c1858a222e85c5be75e0f040ea1 (diff) | |
| download | ffmpeg-f73e3938ac70524826664855210446c3739c4a5e.tar.gz | |
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.
Diffstat (limited to 'libavformat/mp3dec.c')
| -rw-r--r-- | libavformat/mp3dec.c | 5 |
1 files changed, 2 insertions, 3 deletions
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) |