# HG changeset patch # User reimar # Date 1243775388 0 # Node ID 79f3477b277e9a1cc9389f85211751e3c2e73fb8 # Parent ef46d5a66bb26fc1dc4595bdfa1a66e0cefad37f Using nl_langinfo in the asf mmst implementation makes no sense since MPlayer does not use setlocale. Just default to UTF-8 as input charset until there is a better solution. diff -r ef46d5a66bb2 -r 79f3477b277e stream/asf_mmst_streaming.c --- a/stream/asf_mmst_streaming.c Sun May 31 13:00:51 2009 +0000 +++ b/stream/asf_mmst_streaming.c Sun May 31 13:09:48 2009 +0000 @@ -49,9 +49,6 @@ #ifdef CONFIG_ICONV #include -#ifdef HAVE_LANGINFO -#include -#endif #endif #include "url.h" @@ -574,11 +571,7 @@ /* prepare for the url encoding conversion */ #ifdef CONFIG_ICONV -#ifdef HAVE_LANGINFO - url_conv = iconv_open("UTF-16LE",nl_langinfo(CODESET)); -#else - url_conv = iconv_open("UTF-16LE", NULL); -#endif + url_conv = iconv_open("UTF-16LE", "UTF-8"); #endif snprintf (str, 1023, "\034\003NSPlayer/7.0.0.1956; {33715801-BAB3-9D85-24E9-03B90328270A}; Host: %s", url1->hostname);