[Mplayer-cvslog] CVS: main/libmpdemux asf_mmst_streaming.c, 1.20, 1.21

[Alex Beregszaszi]

CVS change done by Alex Beregszaszi

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv30431/libmpdemux

Modified Files:
	asf_mmst_streaming.c 
Log Message:
user nl_langinfo if langinfo support present for proper chinese support, feature requested by Shixin Zheng <shixinzheng at sjtu.edu.cn>

Index: asf_mmst_streaming.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/asf_mmst_streaming.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- asf_mmst_streaming.c	7 Jun 2004 19:23:04 -0000	1.20
+++ asf_mmst_streaming.c	26 Jun 2004 09:54:02 -0000	1.21
@@ -23,8 +23,11 @@
 #endif
 
 #ifdef USE_ICONV
-#include <locale.h>
 #include <iconv.h>
+#ifdef USE_LANGINFO
+#include <langinfo.h>
+#endif
+#include <locale.h>
 #endif
 
 #include "url.h"
@@ -490,8 +493,12 @@
   /* prepare for the url encoding conversion */
 #ifdef USE_ICONV
   setlocale(LC_CTYPE, "");
+#ifdef USE_LANGINFO
+  url_conv = iconv_open("UTF-16LE",nl_langinfo(CODESET));
+#else
   url_conv = iconv_open("UTF-16LE",setlocale(LC_CTYPE, NULL));
 #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));