scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 08:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge and improvements: resize filter refactor and YUYV color scheme resize support, control socket port refactor for setting any possible port when connection type is server, double free corruption when flushing many capture filters solved in video frame data deleter

Browse Source
This commit is contained in:
Castillo, Gerard
2014-08-07 21:55:32 +02:00
parent e7eb6a69e8
commit 5ba5803461
11 changed files with 105 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/control_socket.cpp
View File

@@ -161,7 +161,7 @@ static fd_t create_internal_port(int *port)
}
int control_init(int port, struct control_state **state, struct module *root_module)
int control_init(int port, int connection_type, struct control_state **state, struct module *root_module)
{
control_state *s = new control_state;
@@ -174,8 +174,8 @@ int control_init(int port, struct control_state **state, struct module *root_mod
s->mod.cls = MODULE_CLASS_CONTROL;
s->mod.priv_data = s;
if(port == -1) {
s->network_port = DEFAULT_CONTROL_PORT;
if(connection_type == 0) {
s->network_port = port;
s->connection_type = SERVER;
} else {
s->network_port = port;