Commit 6444ba44 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Vorbis: do not display meaningless data in meta

It can even crash Qt interface
(cherry picked from commit 71a82406)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 22988fc8
...@@ -572,11 +572,6 @@ static void ParseVorbisComments( decoder_t *p_dec ) ...@@ -572,11 +572,6 @@ static void ParseVorbisComments( decoder_t *p_dec )
if( *psz_value == '\0' ) if( *psz_value == '\0' )
break; break;
if( !p_dec->p_description )
p_dec->p_description = vlc_meta_New();
if( p_dec->p_description )
vlc_meta_AddExtra( p_dec->p_description, psz_name, psz_value );
if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_GAIN" ) || if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_GAIN" ) ||
!strcasecmp( psz_name, "RG_RADIO" ) ) !strcasecmp( psz_name, "RG_RADIO" ) )
{ {
...@@ -608,6 +603,16 @@ static void ParseVorbisComments( decoder_t *p_dec ) ...@@ -608,6 +603,16 @@ static void ParseVorbisComments( decoder_t *p_dec )
r->pb_peak[AUDIO_REPLAY_GAIN_ALBUM] = true; r->pb_peak[AUDIO_REPLAY_GAIN_ALBUM] = true;
r->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value ); r->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value );
} }
else if( !strcasecmp( psz_name, "METADATA_BLOCK_PICTURE" ) )
{ /* Do nothing, for now */ }
else
{
if( !p_dec->p_description )
p_dec->p_description = vlc_meta_New();
if( p_dec->p_description )
vlc_meta_AddExtra( p_dec->p_description, psz_name, psz_value );
}
} }
free( psz_comment ); free( psz_comment );
i++; i++;
......
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