Skip padding bytes correctly in ID3 tags.

This fixes a regression introduced in r20170.

Originally committed as revision 20238 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 6 insertions, 1 deletions

diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index 88472e710e..9bc1d0f1c6 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -213,7 +213,12 @@ void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags)
 
         if (tag[0] == 'T')
             read_ttag(s, tlen, tag);
-
+        else if (!tag[0]) {
+            if (tag[1])
+                av_log(s, AV_LOG_WARNING, "invalid frame id, assuming padding");
+            url_fskip(s->pb, len);
+            break;
+        }
         /* Skip to end of tag */
         url_fseek(s->pb, next, SEEK_SET);
     }