mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-28 19:20:35 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-11-03 11:58:42 +01:00
commit 05c3928b11
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit 605cd9a65ed61505f24b840d3fe8e252be72b151
Subproject commit 11f0cd5a3fba36f85cf3e434150bfe66b1bf08d4

4
gst/rtsp-server/rtsp-server.c
View file

@ -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);