From 71d153f81d86077e3f9f519186109b5a84ae68d0 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Mon, 26 Jul 2004 10:57:11 +0000
Subject: [PATCH] Advance the buffer position if an ID3 tag is found. Otherwise
 the function would be stuck in an endless loop.

---
 ChangeLog                 | 5 +++++
 src/common/mp3_common.cpp | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f84bd5c61..374ca3491 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-26  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mkvmerge: bug fix: The word 'TAG' occuring in e.g. SRT subs
+	caused the ID3/MP3 frame detection to be stuck n an endless loop.
+
 2004-07-25  Moritz Bunkus  <moritz@bunkus.org>
 
 	* Released v0.9.4.
diff --git a/src/common/mp3_common.cpp b/src/common/mp3_common.cpp
index 70edd22d1..b0dcf6616 100644
--- a/src/common/mp3_common.cpp
+++ b/src/common/mp3_common.cpp
@@ -282,7 +282,7 @@ find_consecutive_mp3_headers(const unsigned char *buf,
       break;
     mxverb(2, "mp3_reader: Found tag at %d size %d\n", base + pos,
            mp3header.framesize);
-    base = pos + 1;
+    base += pos + 1;
   } while (true);
 
   if (num == 1)