[MPlayer-cvslog] r29333 - trunk/stream/asf_mmst_streaming.c

[reimar]

Author: reimar
Date: Sun May 31 15:09:48 2009
New Revision: 29333

Log:
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.

Modified:
   trunk/stream/asf_mmst_streaming.c

Modified: trunk/stream/asf_mmst_streaming.c
==============================================================================
--- trunk/stream/asf_mmst_streaming.c	Sun May 31 15:00:51 2009	(r29332)
+++ trunk/stream/asf_mmst_streaming.c	Sun May 31 15:09:48 2009	(r29333)
@@ -49,9 +49,6 @@
 
 #ifdef CONFIG_ICONV
 #include <iconv.h>
-#ifdef HAVE_LANGINFO
-#include <langinfo.h>
-#endif
 #endif
 
 #include "url.h"
@@ -574,11 +571,7 @@ int asf_mmst_streaming_start(stream_t *s
 
   /* 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);