M3U: some people do use UTF-8 in m3u, revert to autodetect

diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c
index f4817a5495b0ad4ae8c47c50d5e4ceaa4503e687..cef756e0ed62d668d71b1adbb3b9330228f5a68b 100644 (file)
--- a/modules/demux/playlist/m3u.c
+++ b/modules/demux/playlist/m3u.c
@@ -50,6 +50,11 @@ static int Control( demux_t *p_demux, int i_query, va_list args );
 static void parseEXTINF( char *psz_string, char **ppsz_artist, char **ppsz_name, int *pi_duration );
 static bool ContainsURL( demux_t *p_demux );
 
+static char *GuessEncoding (const char *str)
+{
+    return IsUTF8 (str) ? strdup (str) : FromLatin1 (str);
+}
+
 /*****************************************************************************
  * Import_M3U: main import function
  *****************************************************************************/
@@ -70,7 +75,7 @@ int Import_M3U( vlc_object_t *p_this )
      || demux_IsPathExtension( p_demux, ".vlc" )
      || demux_IsForced( p_demux, "m3u" )
      || ContainsURL( p_demux ) )
-        pf_dup = FromLocaleDup; /* locale character set (?) */
+        pf_dup = GuessEncoding;
     else
         return VLC_EGENERIC;