Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
96deda44
Commit
96deda44
authored
Oct 07, 2011
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed ogg meta data parsing.
It fixes #5374.
parent
8116eb93
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletion
+11
-1
modules/demux/vorbis.h
modules/demux/vorbis.h
+11
-1
No files found.
modules/demux/vorbis.h
View file @
96deda44
...
@@ -58,6 +58,15 @@ static inline void vorbis_ParseComment( vlc_meta_t **pp_meta, const uint8_t *p_d
...
@@ -58,6 +58,15 @@ static inline void vorbis_ParseComment( vlc_meta_t **pp_meta, const uint8_t *p_d
if
(
!
p_meta
)
if
(
!
p_meta
)
return
;
return
;
bool
hasTitle
=
false
;
bool
hasAlbum
=
false
;
bool
hasTrackNumber
=
false
;
bool
hasArtist
=
false
;
bool
hasCopyright
=
false
;
bool
hasDescription
=
false
;
bool
hasGenre
=
false
;
bool
hasDate
=
false
;
for
(
;
i_comment
>
0
;
i_comment
--
)
for
(
;
i_comment
>
0
;
i_comment
--
)
{
{
char
*
psz
;
char
*
psz
;
...
@@ -78,7 +87,7 @@ static inline void vorbis_ParseComment( vlc_meta_t **pp_meta, const uint8_t *p_d
...
@@ -78,7 +87,7 @@ static inline void vorbis_ParseComment( vlc_meta_t **pp_meta, const uint8_t *p_d
if( !strncasecmp(psz, txt, strlen(txt)) ) \
if( !strncasecmp(psz, txt, strlen(txt)) ) \
{ \
{ \
const char *oldval = vlc_meta_Get( p_meta, vlc_meta_ ## var ); \
const char *oldval = vlc_meta_Get( p_meta, vlc_meta_ ## var ); \
if( oldval ) \
if( oldval
&& has##var
) \
{ \
{ \
char * newval; \
char * newval; \
if( asprintf( &newval, "%s,%s", oldval, &psz[strlen(txt)] ) == -1 ) \
if( asprintf( &newval, "%s,%s", oldval, &psz[strlen(txt)] ) == -1 ) \
...
@@ -88,6 +97,7 @@ static inline void vorbis_ParseComment( vlc_meta_t **pp_meta, const uint8_t *p_d
...
@@ -88,6 +97,7 @@ static inline void vorbis_ParseComment( vlc_meta_t **pp_meta, const uint8_t *p_d
} \
} \
else \
else \
vlc_meta_Set( p_meta, vlc_meta_ ## var, &psz[strlen(txt)] ); \
vlc_meta_Set( p_meta, vlc_meta_ ## var, &psz[strlen(txt)] ); \
has##var = true; \
}
}
IF_EXTRACT
(
"TITLE="
,
Title
)
IF_EXTRACT
(
"TITLE="
,
Title
)
else
IF_EXTRACT
(
"ALBUM="
,
Album
)
else
IF_EXTRACT
(
"ALBUM="
,
Album
)
...
...
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