[vlc-devel] commit: M3U: some people do use UTF-8 in m3u, revert to autodetect ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Dec 5 15:44:08 CET 2009


vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sat Dec  5 16:43:05 2009 +0200| [7c89526ce1545befa57074aba2cd9c3160a7eb46] | committer: Rémi Denis-Courmont 

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

(cherry picked from commit 9a1a33f4fce950b8ebb32b3a60069792382add0f)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7c89526ce1545befa57074aba2cd9c3160a7eb46
---

 modules/demux/playlist/m3u.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c
index e44fcec..5884c6e 100644
--- 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;
 




More information about the vlc-devel mailing list