Skip to content

V
vlc
Commit 2b0b16f6 authored by Anatoliy Anischovich's avatar Anatoliy Anischovich Committed by Rafaël Carré
Browse files
Options

taglib: init attachments before reading special tags 

Signed-off-by: default avatarRafaël Carré <funman@videolan.org>
parent b28313ac
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
modules/meta_engine/taglib.cpp
View file @ 2b0b16f6
...@@ -415,7 +415,6 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_meta_t* p_demux_meta, vlc_ ...@@ -415,7 +415,6 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_meta_t* p_demux_meta, vlc_
if( list.isEmpty() ) if( list.isEmpty() )
return; return;
TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
for( iter = list.begin(); iter != list.end(); iter++ ) for( iter = list.begin(); iter != list.end(); iter++ )
{ {
ID3v2::AttachedPictureFrame* p_apic = ID3v2::AttachedPictureFrame* p_apic =
...@@ -594,7 +593,6 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_meta_t* p_demux_meta, ...@@ -594,7 +593,6 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_meta_t* p_demux_meta,
&i_cover_score, &i_cover_idx ); &i_cover_score, &i_cover_idx );
} }
TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
if (p_attachment) { if (p_attachment) {
TAB_APPEND_CAST( (input_attachment_t**), TAB_APPEND_CAST( (input_attachment_t**),
p_demux_meta->i_attachments, p_demux_meta->attachments, p_demux_meta->i_attachments, p_demux_meta->attachments,
...@@ -646,7 +644,6 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta ...@@ -646,7 +644,6 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes", msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
psz_format, list[0].data().size() ); psz_format, list[0].data().size() );
TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
input_attachment_t *p_attachment = input_attachment_t *p_attachment =
vlc_input_attachment_New( "cover", psz_format, "cover", vlc_input_attachment_New( "cover", psz_format, "cover",
list[0].data().data(), list[0].data().size() ); list[0].data().data(), list[0].data().size() );
...@@ -729,6 +726,7 @@ static int ReadMeta( vlc_object_t* p_this) ...@@ -729,6 +726,7 @@ static int ReadMeta( vlc_object_t* p_this)
#undef SETINT #undef SETINT
#undef SET #undef SET
TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
// Try now to read special tags // Try now to read special tags
#ifdef TAGLIB_HAVE_APEFILE_H #ifdef TAGLIB_HAVE_APEFILE_H
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment