Index: modules/demux/m3u.c
===================================================================
--- modules/demux/m3u.c	(Revision 12211)
+++ modules/demux/m3u.c	(Arbeitskopie)
@@ -127,7 +127,7 @@
     if( i_type != TYPE_M3U )
     {
         char *p_peek;
-        int i_size = stream_Peek( p_demux->s, (uint8_t *)&p_peek, MAX_LINE );
+        int i_size = stream_Peek( p_demux->s, (uint8_t **)&p_peek, MAX_LINE );
         i_size -= sizeof("[Reference]") - 1;
 
         if( i_size > 0 )
Index: modules/demux/playlist/m3u.c
===================================================================
--- modules/demux/playlist/m3u.c	(Revision 12211)
+++ modules/demux/playlist/m3u.c	(Arbeitskopie)
@@ -44,7 +44,7 @@
  *****************************************************************************/
 static int Demux( demux_t *p_demux);
 static int Control( demux_t *p_demux, int i_query, va_list args );
-static void parseEXTINF( char *psz_string, char **ppsz_author, char **ppsz_name, int *pi_duration );
+static void parseEXTINF( char *psz_string, char **ppsz_artist, char **ppsz_name, int *pi_duration );
 
 /*****************************************************************************
  * Import_M3U: main import function
@@ -110,7 +110,7 @@
     char       *psz_line;
 
     char       *psz_name = NULL;
-    char       *psz_author = NULL;
+    char       *psz_artist = NULL;
     int        i_parsed_duration = 0;
     mtime_t    i_duration = -1;
     char       **ppsz_options = NULL;
@@ -159,16 +159,15 @@
             {
                 /* Extended info */
                 psz_parse += sizeof("EXTINF:") - 1;
-                parseEXTINF( psz_parse, &psz_author, &psz_name, &i_parsed_duration );
+                parseEXTINF( psz_parse, &psz_artist, &psz_name, &i_parsed_duration );
                 i_duration = i_parsed_duration * 1000000;
                 if ( psz_name )
                     psz_name = strdup( psz_name );
-                if ( psz_author )
-                    psz_author = strdup( psz_author );
+                if ( psz_artist )
+                    psz_artist = strdup( psz_artist );
             }
             else if( !strncasecmp( psz_parse, "EXTVLCOPT:",
                                    sizeof("EXTVLCOPT:") -1 ) )
-
             {
                 /* VLC Option */
                 char *psz_option;
@@ -205,9 +204,9 @@
                 playlist_ItemAddOption( p_item, ppsz_options[i] );
             }
             p_item->input.i_duration = i_duration;
-            if ( psz_author )
+            if ( psz_artist )
                 vlc_input_item_AddInfo( &p_item->input, _("Meta-information"),
-                                        _("Artist"), "%s", psz_author );
+                                        _("Artist"), "%s", psz_artist );
             playlist_NodeAddItem( p_playlist, p_item,
                                   p_current->pp_parents[0]->i_view,
                                   p_current, PLAYLIST_APPEND,
@@ -238,8 +237,8 @@
             ppsz_options = NULL; i_options = 0;
             if( psz_name ) free( psz_name );
             psz_name = NULL;
-            if ( psz_author ) free( psz_author );
-            psz_author = NULL;
+            if ( psz_artist ) free( psz_artist );
+            psz_artist = NULL;
             i_parsed_duration = 0;
             i_duration = -1;
 
@@ -266,12 +265,11 @@
     return VLC_EGENERIC;
 }
 
-static void parseEXTINF(char *psz_string, char **ppsz_author, 
+static void parseEXTINF(char *psz_string, char **ppsz_artist, 
                         char **ppsz_name, int *pi_duration)
 {
     char *end=NULL;
-    char *psz_item=NULL;
-    char *pos;
+    char *psz_temp=NULL;
 
     end = psz_string + strlen( psz_string );
 
@@ -280,15 +278,15 @@
          psz_string++ );
 
     /* read all digits */
-    psz_item = psz_string;
+    psz_temp = psz_string;
     while ( psz_string < end && *psz_string >= '0' && *psz_string <= '9' )
     {
         psz_string++;
     }
-    if ( *psz_item >= '0' && *psz_item <= '9' && *psz_string == ',' )
+    if ( *psz_temp >= '0' && *psz_temp <= '9' && *psz_string == ',' )
     {
         *psz_string = '\0';
-        *pi_duration = atoi(psz_item);
+        *pi_duration = atoi(psz_temp);
     }
     else
     {
@@ -299,23 +297,16 @@
         psz_string++;
     }
 
-    /* read the author */
-    /* parse the author until unescaped comma is reached */
-    psz_item = pos = psz_string;
-    while( psz_string < end && *psz_string != ',' )
+    /* analyse the remaining string */
+    psz_temp = strstr( psz_string, " - " );
+    if ( psz_temp )
     {
-        if( *psz_string == '\\' )
-            psz_string++;                 /* Skip escape character */
-        *pos++ = *psz_string++;
+        *psz_temp='\0';
+        *ppsz_artist = psz_string;
+        *ppsz_name = psz_temp + 3;          /* points directly after ' - ' */
+    } else {
+        *ppsz_name = psz_string;
     }
-    *pos = '\0';                          /* terminate the item */
-    *ppsz_author = psz_item;
-
-    if( psz_string < end )               /* continue parsing if possible */
-        psz_string++;
-    /* the title doesn't need to be escaped */
-    *ppsz_name = psz_string;
-
     return;
 }
 
Index: modules/misc/playlist/m3u.c
===================================================================
--- modules/misc/playlist/m3u.c	(Revision 12211)
+++ modules/misc/playlist/m3u.c	(Arbeitskopie)
@@ -63,52 +63,26 @@
              strcmp( p_playlist->pp_items[i]->input.psz_name,
                     p_playlist->pp_items[i]->input.psz_uri ) )
         {
-            char *psz_author =
-                   vlc_input_item_GetInfo( &p_playlist->pp_items[i]->input,
-                                         _("Meta-information"), _("Artist") );
-            if( psz_author && *psz_author )
+            char *psz_artist =
+                vlc_input_item_GetInfo( &p_playlist->pp_items[i]->input,
+                                        _("Meta-information"), _("Artist") );
+            if( psz_artist && *psz_artist )
             {
-                /* the author must be escaped if it contains a comma */
-                char *p_src; short i_cnt;
-                /* so count the commas or backslash */
-                for( i_cnt = 0, p_src = psz_author; *p_src; p_src++ )
-                    if(*p_src == ',' || *p_src == '\\' )
-                        i_cnt++;
-                /* Is there a comma ? */
-                if( i_cnt )
-                {
-                    char *psz_escaped=NULL;
-                    char *p_dst;
-                    psz_escaped = (char *)malloc( ( strlen( psz_author )
-                                             + i_cnt + 1 ) * sizeof( char ) );
-                    if( !psz_escaped )
-                        return VLC_ENOMEM;
-                    /* copy the string and escape every comma with backslash */
-                    for( p_src=psz_author, p_dst=psz_escaped; *p_src;
-                         p_src++, p_dst++ )
-                    {
-                        if( *p_src == ',' || *p_src == '\\' )
-                            *p_dst++ = '\\';
-                        *p_dst = *p_src;
-                    }
-                    *p_dst = '\0';
-                    free( psz_author);
-                    psz_author = psz_escaped;
-                }
-                fprintf( p_export->p_file, "#EXTINF:%i,%s,%s\n",
-                       (int)(p_playlist->pp_items[i]->input.i_duration/1000000),
-                         psz_author,
+                /* write EXTINF with artist */
+                fprintf( p_export->p_file, "#EXTINF:%i,%s - %s\n",
+                         (int)(p_playlist->pp_items[i]->input.i_duration/1000000),
+                         psz_artist,
                          p_playlist->pp_items[i]->input.psz_name );
             }
             else
             {
-                /* write EXTINF without author */
-                fprintf( p_export->p_file, "#EXTINF:%i,,%s\n",
+                /* write EXTINF without artist */
+                fprintf( p_export->p_file, "#EXTINF:%i,%s\n",
                        (int)(p_playlist->pp_items[i]->input.i_duration/1000000),
                          p_playlist->pp_items[i]->input.psz_name );
             }
-            if( psz_author )
-                free( psz_author );
+            if( psz_artist )
+                free( psz_artist );
         }
 
         /* VLC specific options */
