diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
| commit | 6cce822505c0a76ac520909a895021b8f5b7e5ab (patch) | |
| tree | f8ba954c698470208a243be3da216f7f54367f46 /stream/asf_mmst_streaming.c | |
| parent | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff) | |
| parent | ded7033671fb7d84fbdb67ace46c1fc8833631bc (diff) | |
| download | mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.bz2 mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.xz | |
Merge svn changes up to r27399
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
Diffstat (limited to 'stream/asf_mmst_streaming.c')
| -rw-r--r-- | stream/asf_mmst_streaming.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/stream/asf_mmst_streaming.c b/stream/asf_mmst_streaming.c index 54e62bf560..6301711176 100644 --- a/stream/asf_mmst_streaming.c +++ b/stream/asf_mmst_streaming.c @@ -46,12 +46,12 @@ #endif #ifndef CONFIG_SETLOCALE -#undef CONFIG_ICONV +#undef HAVE_ICONV #endif -#ifdef CONFIG_ICONV +#ifdef HAVE_ICONV #include <iconv.h> -#ifdef CONFIG_LANGINFO +#ifdef HAVE_LANGINFO #include <langinfo.h> #endif #endif @@ -143,13 +143,13 @@ static void send_command (int s, int command, uint32_t switches, } } -#ifdef CONFIG_ICONV +#ifdef HAVE_ICONV static iconv_t url_conv; #endif static void string_utf16(char *dest, char *src, int len) { int i; -#ifdef CONFIG_ICONV +#ifdef HAVE_ICONV size_t len1, len2; char *ip, *op; @@ -172,7 +172,7 @@ static void string_utf16(char *dest, char *src, int len) { /* trailing zeroes */ dest[i*2] = 0; dest[i*2+1] = 0; -#ifdef CONFIG_ICONV +#ifdef HAVE_ICONV } #endif } @@ -575,8 +575,8 @@ int asf_mmst_streaming_start(stream_t *stream) * */ /* prepare for the url encoding conversion */ -#ifdef CONFIG_ICONV -#ifdef CONFIG_LANGINFO +#ifdef HAVE_ICONV +#ifdef HAVE_LANGINFO url_conv = iconv_open("UTF-16LE",nl_langinfo(CODESET)); #else url_conv = iconv_open("UTF-16LE", NULL); @@ -691,7 +691,7 @@ int asf_mmst_streaming_start(stream_t *stream) packet_length1 = packet_length; mp_msg(MSGT_NETWORK,MSGL_INFO,"mmst packet_length = %d\n", packet_length); -#ifdef CONFIG_ICONV +#ifdef HAVE_ICONV if (url_conv != (iconv_t)(-1)) iconv_close(url_conv); #endif |