X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fvorbis.c;h=1782e069feb4bff2085f2a9498c247f86ea09d9c;hb=df93f14938fa1201d69036b65945dcd64c739cce;hp=c6a1d0927f2ed94754aab294992f723c8355d718;hpb=85b29bdc288a1573d43bd524908be5748a9b3640;p=vlc diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c index c6a1d0927f..1782e069fe 100644 --- a/modules/codec/vorbis.c +++ b/modules/codec/vorbis.c @@ -1,7 +1,7 @@ /***************************************************************************** * vorbis.c: vorbis decoder/encoder/packetizer module making use of libvorbis. ***************************************************************************** - * Copyright (C) 2001-2003 VideoLAN (Centrale Réseaux) and its contributors + * Copyright (C) 2001-2003 the VideoLAN team * $Id$ * * Authors: Gildas Bazin @@ -311,6 +311,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) if( p_sys->i_headers == 0 && p_dec->fmt_in.i_extra ) { /* Headers already available as extra data */ + msg_Dbg( p_dec, "Headers already available as extra data" ); p_sys->i_headers = 3; } else if( oggpacket.bytes && p_sys->i_headers < 3 ) @@ -617,12 +618,12 @@ static void ParseVorbisComments( decoder_t *p_dec ) input_Control( p_input, INPUT_ADD_INFO, _("Vorbis comment"), psz_name, psz_value ); /* HACK, we should use meta */ - if( strstr( psz_name, "artist" ) ) + if( strcasestr( psz_name, "artist" ) ) { input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"), _("Artist"), psz_value ); } - else if( strstr( psz_name, "title" ) ) + else if( strcasestr( psz_name, "title" ) ) { p_input->input.p_item->psz_name = strdup( psz_value ); } @@ -708,7 +709,7 @@ static void CloseDecoder( vlc_object_t *p_this ) decoder_t *p_dec = (decoder_t *)p_this; decoder_sys_t *p_sys = p_dec->p_sys; - if( !p_sys->b_packetizer && p_sys->i_headers >= 3 ) + if( !p_sys->b_packetizer && p_sys->i_headers > 3 ) { vorbis_block_clear( &p_sys->vb ); vorbis_dsp_clear( &p_sys->vd );