LGPL

[vlc] / modules / demux / playlist / itml.h

diff --git a/modules/demux/playlist/itml.h b/modules/demux/playlist/itml.h
index 58c75061b1756476c2716508f1c1baa0f808caa0..213e2a598aeb34245081faad43677c801143353f 100644 (file)
--- a/modules/demux/playlist/itml.h
+++ b/modules/demux/playlist/itml.h
@@ -1,24 +1,24 @@
 /*******************************************************************************
- * itml.c : iTunes Music Library import functions
+ * itml.h : iTunes Music Library import functions
  *******************************************************************************
- * Copyright (C) 2007 the VideoLAN team
+ * Copyright (C) 2007 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Yoann Peronneau <yoann@videolan.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *******************************************************************************/
 /**
  * \file modules/demux/playlist/itml.h
@@ -26,11 +26,10 @@
  */
 
 /* defines */
-#define FREE_NAME()     FREENULL( psz_name )
 #define FREE_VALUE()    FREENULL( psz_value )
 #define FREE_KEY()      FREENULL( psz_key )
-#define FREE_ATT()      do{ FREE_NAME();FREE_VALUE(); }while(0)
-#define FREE_ATT_KEY()  do{ FREE_NAME();FREE_VALUE();FREE_KEY();} while(0)
+#define FREE_ATT()      FREE_VALUE()
+#define FREE_ATT_KEY()  do{ FREE_VALUE();FREE_KEY();} while(0)
 
 #define UNKNOWN_CONTENT 0
 #define SIMPLE_CONTENT 1
@@ -40,7 +39,7 @@
                            const char      *psz_name,\
                            char            *psz_value)
 #define COMPLEX_INTERFACE (demux_t         *p_demux,\
-                           input_item_t    *p_input_item,\
+                           input_item_node_t    *p_input_node,\
                            track_elem_t    *p_track,\
                            xml_reader_t    *p_xml_reader,\
                            const char      *psz_element,\