summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-02 22:04:35 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-02 22:04:35 +0300
commit6cce822505c0a76ac520909a895021b8f5b7e5ab (patch)
treef8ba954c698470208a243be3da216f7f54367f46 /stream
parent04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff)
parentded7033671fb7d84fbdb67ace46c1fc8833631bc (diff)
downloadmpv-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')
-rw-r--r--stream/asf_mmst_streaming.c18
-rw-r--r--stream/cache2.c2
-rw-r--r--stream/librtsp/rtsp_rtp.c4
-rw-r--r--stream/tcp.c4
-rw-r--r--stream/udp.c4
5 files changed, 16 insertions, 16 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
diff --git a/stream/cache2.c b/stream/cache2.c
index 0696526f32..366727302a 100644
--- a/stream/cache2.c
+++ b/stream/cache2.c
@@ -369,7 +369,7 @@ static void ThreadProc( void *s ){
#endif
#endif
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
use_gui = 0; // mp_msg may not use gui stuff in forked code
#endif
// cache thread mainloop:
diff --git a/stream/librtsp/rtsp_rtp.c b/stream/librtsp/rtsp_rtp.c
index beda0dac4f..b582b1a700 100644
--- a/stream/librtsp/rtsp_rtp.c
+++ b/stream/librtsp/rtsp_rtp.c
@@ -297,7 +297,7 @@ rtp_connect (char *hostname, int port)
sin.sin_addr.s_addr = htonl (INADDR_ANY);
else
#ifndef HAVE_WINSOCK2
-#ifdef CONFIG_ATON
+#ifdef HAVE_ATON
inet_aton (hostname, &sin.sin_addr);
#else
inet_pton (AF_INET, hostname, &sin.sin_addr);
@@ -386,7 +386,7 @@ is_multicast_address (char *addr)
sin.sin_family = AF_INET;
#ifndef HAVE_WINSOCK2
-#ifdef CONFIG_ATON
+#ifdef HAVE_ATON
inet_aton (addr, &sin.sin_addr);
#else
inet_pton (AF_INET, addr, &sin.sin_addr);
diff --git a/stream/tcp.c b/stream/tcp.c
index f4c71f651d..950c434886 100644
--- a/stream/tcp.c
+++ b/stream/tcp.c
@@ -116,7 +116,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
memset(&server_address, 0, sizeof(server_address));
#ifndef HAVE_WINSOCK2
-#ifdef CONFIG_ATON
+#ifdef HAVE_ATON
if (inet_aton(host, our_s_addr)!=1)
#else
if (inet_pton(af, host, our_s_addr)!=1)
@@ -164,7 +164,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
return TCP_ERROR_FATAL;
}
-#if defined(CONFIG_ATON) || defined(HAVE_WINSOCK2)
+#if defined(HAVE_ATON) || defined(HAVE_WINSOCK2)
strncpy( buf, inet_ntoa( *((struct in_addr*)our_s_addr) ), 255);
#else
inet_ntop(af, our_s_addr, buf, 255);
diff --git a/stream/udp.c b/stream/udp.c
index 7ad2542ba1..759c5a9675 100644
--- a/stream/udp.c
+++ b/stream/udp.c
@@ -92,11 +92,11 @@ udp_open_socket (URL_t *url)
else
{
#ifndef HAVE_WINSOCK2
-#ifdef CONFIG_ATON
+#ifdef HAVE_ATON
inet_aton (url->hostname, &server_address.sin_addr);
#else
inet_pton (AF_INET, url->hostname, &server_address.sin_addr);
-#endif /* CONFIG_ATON */
+#endif /* HAVE_ATON */
#else
server_address.sin_addr.s_addr = htonl(INADDR_ANY);
#endif /* HAVE_WINSOCK2 */