From 5692ed3ad4b6ce25ce6ffb64a0ce33265623c21c Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 28 Feb 2010 16:40:17 +0000
Subject: [PATCH] Many mp3s seem to contain padding after id3 tags that is not
 considered in the tag size. Skip this to make the format probing quicker.

Originally committed as revision 22111 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/mp3.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/mp3.c b/libavformat/mp3.c
index 4579773369..a111b19272 100644
--- a/libavformat/mp3.c
+++ b/libavformat/mp3.c
@@ -45,10 +45,12 @@ static int mp3_read_probe(AVProbeData *p)
     if(ff_id3v2_match(buf0)) {
         buf0 += ff_id3v2_tag_len(buf0);
     }
+    end = p->buf + p->buf_size - sizeof(uint32_t);
+    while(buf0 < end && !*buf0)
+        buf0++;
 
     max_frames = 0;
     buf = buf0;
-    end = p->buf + p->buf_size - sizeof(uint32_t);
 
     for(; buf < end; buf= buf2+1) {
         buf2 = buf;