Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
454
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
ee7e7136
Commit
ee7e7136
authored
9 years ago
by
François Cartegnie
Browse files
Options
Downloads
Patches
Plain Diff
meta_reader: fix taglib leak on static method
parent
affc32b9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/meta_engine/taglib.cpp
+12
-3
12 additions, 3 deletions
modules/meta_engine/taglib.cpp
with
12 additions
and
3 deletions
modules/meta_engine/taglib.cpp
+
12
−
3
View file @
ee7e7136
...
...
@@ -129,6 +129,12 @@ File *VLCTagLib::ExtResolver<T>::createFile(FileName fileName, bool, AudioProper
return
0
;
}
#if TAGLIB_VERSION >= TAGLIB_SYNCDECODE_FIXED_VERSION
static
VLCTagLib
::
ExtResolver
<
MPEG
::
File
>
aacresolver
(
".aac"
);
#endif
static
VLCTagLib
::
ExtResolver
<
MP4
::
File
>
m4vresolver
(
".m4v"
);
static
bool
b_extensions_registered
=
false
;
// taglib is not thread safe
static
vlc_mutex_t
taglib_lock
=
VLC_STATIC_MUTEX
;
...
...
@@ -718,11 +724,14 @@ static int ReadMeta( vlc_object_t* p_this)
if
(
psz_path
==
NULL
)
return
VLC_EGENERIC
;
if
(
!
b_extensions_registered
)
{
#if TAGLIB_VERSION >= TAGLIB_SYNCDECODE_FIXED_VERSION
FileRef
::
addFileTypeResolver
(
new
VLCTagLib
::
ExtResolver
<
MPEG
::
File
>
(
".aac"
)
);
FileRef
::
addFileTypeResolver
(
&
aacresolver
);
#endif
FileRef
::
addFileTypeResolver
(
new
VLCTagLib
::
ExtResolver
<
MP4
::
File
>
(
".m4v"
)
);
FileRef
::
addFileTypeResolver
(
&
m4vresolver
);
b_extensions_registered
=
true
;
}
#if defined(_WIN32)
wchar_t
*
wpath
=
ToWide
(
psz_path
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment