From e2466a72f8510034a5a43f27d2aa47c888ec9bf6 Mon Sep 17 00:00:00 2001 From: Tsuda Kageyu Date: Mon, 31 Aug 2015 16:20:15 +0900 Subject: [PATCH] Revert "Skip both ID3v1 and APE tags when seeking the last MPEG frame." This reverts commit 6d925da75e7dc84db22f3c7aee290136fa3878ea. --- taglib/mpeg/mpegfile.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/taglib/mpeg/mpegfile.cpp b/taglib/mpeg/mpegfile.cpp index 9ae1dffa..43075cfc 100644 --- a/taglib/mpeg/mpegfile.cpp +++ b/taglib/mpeg/mpegfile.cpp @@ -469,16 +469,7 @@ long MPEG::File::firstFrameOffset() long MPEG::File::lastFrameOffset() { - long position; - - if(hasAPETag()) - position = d->APELocation - 1; - else if(hasID3v1Tag()) - position = d->ID3v1Location - 1; - else - position = length(); - - return previousFrameOffset(position); + return previousFrameOffset(hasID3v1Tag() ? d->ID3v1Location - 1 : length()); } bool MPEG::File::hasID3v1Tag() const