Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
40f0a08c
Commit
40f0a08c
authored
Jul 04, 2012
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: taglib: use original patch present in taglib.git
parent
dfa75177
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
15 deletions
+27
-15
contrib/src/taglib/7036.patch
contrib/src/taglib/7036.patch
+27
-15
No files found.
contrib/src/taglib/7036.patch
View file @
40f0a08c
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 <net147@gmail.com>
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment