Merge remote-tracking branch 'luzero/segment'

[ffmpeg] / libavformat / mp3dec.c

diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 73fce71ceac40587ec6c7515f2a6d33fccd3b474..7fe7df26091314299c780962976dcf9f8ef27830 100644 (file)
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -110,8 +110,8 @@ static int mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base)
         if(avio_rb16(s->pb) == 1) {
             /* skip delay and quality */
             avio_skip(s->pb, 4);
-            frames = avio_rb32(s->pb);
             size = avio_rb32(s->pb);
+            frames = avio_rb32(s->pb);
         }
     }
 
@@ -174,7 +174,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 &&