all: updated my name and e-mail address

[vlc] / modules / demux / m3u.c

diff --git a/modules/demux/m3u.c b/modules/demux/m3u.c
index 06dee5a3510ec6389af2a33a80990b04c19283f3..eb81d3b5063c3f233583d3c3eb0359a2fa1b7a51 100644 (file)
--- a/modules/demux/m3u.c
+++ b/modules/demux/m3u.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * m3u.c: a meta demux to parse pls, m3u, asx et b4s playlists
  *****************************************************************************
- * Copyright (C) 2001-2004 VideoLAN
+ * Copyright (C) 2001-2004 the VideoLAN team
  * $Id$
  *
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
  *          Gildas Bazin <gbazin@videolan.org>
  *          Clément Stenac <zorglub@via.ecp.fr>
  *
@@ -126,8 +126,8 @@ static int Activate( vlc_object_t * p_this )
     /* We double check for file != m3u as some asx are just m3u file */
     if( i_type != TYPE_M3U )
     {
-        uint8_t *p_peek;
-        int i_size = stream_Peek( p_demux->s, &p_peek, MAX_LINE );
+        char *p_peek;
+        int i_size = stream_Peek( p_demux->s, (uint8_t **)&p_peek, MAX_LINE );
         i_size -= sizeof("[Reference]") - 1;
 
         if( i_size > 0 )
@@ -652,7 +652,7 @@ static vlc_bool_t FindItem( demux_t *p_demux, playlist_t *p_playlist,
      {
          input_item_t *p_current =
              ((input_thread_t*)p_demux->p_parent)->input.p_item;
-         *pp_item = playlist_ItemGetByInput( p_playlist, p_current );
+         *pp_item = playlist_LockItemGetByInput( p_playlist, p_current );
 
          if( !*pp_item )
              msg_Dbg( p_playlist, "unable to find item in playlist");