diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-03 11:58:42 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-03 11:58:42 +0100 |
| commit | 05c3928b11a9bfe27851b1ac21c8a088fc12a122 (patch) | |
| tree | 1bb4b1c66f9623d39adef7fc822182e050563efe | |
| parent | 7c147e48ea4f7d66bd732faa32418c48e9a6d8c6 (diff) | |
| parent | 20b6be38527123836c656570b1d503fc7967ca39 (diff) | |
Merge branch 'master' into 0.11
| m--------- | common | 0 | ||||
| -rw-r--r-- | gst/rtsp-server/rtsp-server.c | 4 |
2 files changed, 4 insertions, 0 deletions
diff --git a/common b/common -Subproject 605cd9a65ed61505f24b840d3fe8e252be72b15 +Subproject 11f0cd5a3fba36f85cf3e434150bfe66b1bf08d diff --git a/gst/rtsp-server/rtsp-server.c b/gst/rtsp-server/rtsp-server.c index 4477d8d..f1f431f 100644 --- a/gst/rtsp-server/rtsp-server.c +++ b/gst/rtsp-server/rtsp-server.c @@ -650,7 +650,11 @@ gst_rtsp_server_get_io_channel (GstRTSPServer * server) "listened on server socket %d, returning from connection setup", sockfd); /* create IO channel for the socket */ +#ifdef G_OS_WIN32 + channel = g_io_channel_win32_new_socket (sockfd); +#else channel = g_io_channel_unix_new (sockfd); +#endif g_io_channel_set_close_on_unref (channel, TRUE); GST_INFO_OBJECT (server, "listening on service %s", server->service); |