From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Thu, 7 Jan 2016 17:22:44 +0000 (+0900)
Subject: Revert some unnecessary changes.
X-Git-Tag: v1.11beta~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a5fb7d672a966344bd632b9fcc8326d0fa7c58b;p=taglib

Revert some unnecessary changes.
---

diff --git a/taglib/mpeg/mpegheader.cpp b/taglib/mpeg/mpegheader.cpp
index 7f82a607..53c559fa 100644
--- a/taglib/mpeg/mpegheader.cpp
+++ b/taglib/mpeg/mpegheader.cpp
@@ -306,19 +306,10 @@ void MPEG::Header::parse(File *file, long offset, bool checkLength)
 
   if(checkLength) {
 
-    bool nextFrameFound = false;
-
     file->seek(offset + d->frameLength);
-    const ByteVector nextSynch = file->readBlock(16);
-
-    for(int i = 0; i < static_cast<int>(nextSynch.size()) - 1; ++i) {
-      if(firstSyncByte(nextSynch[i]) && secondSynchByte(nextSynch[i + 1])) {
-        nextFrameFound = true;
-        break;
-      }
-    }
+    const ByteVector nextSynch = file->readBlock(2);
 
-    if(!nextFrameFound) {
+    if(nextSynch.size() < 2 || !firstSyncByte(nextSynch[0]) || !secondSynchByte(nextSynch[1])) {
       debug("MPEG::Header::parse() -- Calculated frame length did not match the actual length.");
       return;
     }