Index: stream/asf_mmst_streaming.c
===================================================================
--- stream/asf_mmst_streaming.c	(revision 29289)
+++ stream/asf_mmst_streaming.c	(working copy)
@@ -533,6 +533,9 @@
   char                *path, *unescpath;
   URL_t *url1 = stream->streaming_ctrl->url;
   int s = stream->fd;
+#ifdef CONFIG_ICONV
+  const char *url_charset;
+#endif

   if( s>0 ) {
 	  closesocket( stream->fd );
@@ -574,12 +577,12 @@

   /* 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);
+  url_charset = getenv("MPLAYER_CHARSET");
+  if (!url_charset)
+    url_charset = "UTF-8";
+
+  url_conv = iconv_open("UTF-16LE", url_charset);
 #endif
-#endif

   snprintf (str, 1023, "\034\003NSPlayer/7.0.0.1956; {33715801-BAB3-9D85-24E9-03B90328270A}; Host: %s", url1->hostname);
   string_utf16 (data, str, strlen(str));