vlc/vlc-2.0 | branch: master | Rafaël Carré <[email protected]> | Wed Jul 4 19:22:25 2012 +0200| [b5e0e241a0f5e1dafa4625f7ad193d27f69188bc] | committer: Felix Paul Kühne
contrib: taglib: use original patch present in taglib.git (cherry picked from commit 40f0a08c4667a3b6497a1cdb2d57a081d4210226) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=b5e0e241a0f5e1dafa4625f7ad193d27f69188bc --- contrib/src/taglib/7036.patch | 42 ++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/contrib/src/taglib/7036.patch b/contrib/src/taglib/7036.patch index 7c41dad..4c8f98c 100644 --- a/contrib/src/taglib/7036.patch +++ b/contrib/src/taglib/7036.patch @@ -1,15 +1,27 @@ -diff --git a/taglib/mpeg/id3v2/id3v2tag.cpp b/taglib/mpeg/id3v2/id3v2tag.cpp -index c6fe7b7..ebb1969 100644 ---- a/taglib/mpeg/id3v2/id3v2tag.cpp -+++ b/taglib/mpeg/id3v2/id3v2tag.cpp -@@ -652,7 +652,9 @@ void ID3v2::Tag::parse(const ByteVector &origData) - return; - } - -- Frame *frame = d->factory->createFrame(data.mid(frameDataPosition), -+ Frame *frame = NULL; -+ if (d->factory) -+ frame = d->factory->createFrame(data.mid(frameDataPosition), - &d->header); - - if(!frame) +From 7cc36db7606dfc85d2e344d35c4e26fe8f698bdc Mon Sep 17 00:00:00 2001 +From: Jonathan Liu <[email protected]> +Date: Sat, 6 Aug 2011 11:05:11 +0200 +Subject: [PATCH] Use the default frame factory when it's necessary to parse + ID3v2 tags in APE files + +https://bugs.kde.org/show_bug.cgi?id=278773 +--- + taglib/ape/apeproperties.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/taglib/ape/apeproperties.cpp b/taglib/ape/apeproperties.cpp +index 3154d10..aab9d25 100644 +--- a/taglib/ape/apeproperties.cpp ++++ b/taglib/ape/apeproperties.cpp +@@ -137,7 +137,7 @@ long APE::Properties::findDescriptor() + long ID3v2OriginalSize = 0; + bool hasID3v2 = false; + if(ID3v2Location >= 0) { +- ID3v2::Tag tag(d->file, ID3v2Location, 0); ++ ID3v2::Tag tag(d->file, ID3v2Location); + ID3v2OriginalSize = tag.header()->completeTagSize(); + if(tag.header()->tagSize() > 0) + hasID3v2 = true; +-- +1.7.9.5 + _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
