From c783e58e912da6b1a54c584d370b9720545cef6b Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 31 May 2009 13:09:48 +0000 Subject: 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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29333 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/asf_mmst_streaming.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/stream/asf_mmst_streaming.c b/stream/asf_mmst_streaming.c index 0fb7179948..6d764617a4 100644 --- a/stream/asf_mmst_streaming.c +++ b/stream/asf_mmst_streaming.c @@ -49,9 +49,6 @@ #ifdef CONFIG_ICONV #include -#ifdef HAVE_LANGINFO -#include -#endif #endif #include "url.h" @@ -574,11 +571,7 @@ int asf_mmst_streaming_start(stream_t *stream) /* 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); -- cgit v1.2.3