diff options
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/bridge_holding.c | 2 | ||||
| -rw-r--r-- | bridges/bridge_native_rtp.c | 10 | ||||
| -rw-r--r-- | bridges/bridge_simple.c | 2 | ||||
| -rw-r--r-- | bridges/bridge_softmix.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/bridges/bridge_holding.c b/bridges/bridge_holding.c index 9d0ba721a..5eeb4708d 100644 --- a/bridges/bridge_holding.c +++ b/bridges/bridge_holding.c @@ -433,7 +433,7 @@ static int unload_module(void) static int load_module(void) { - if (!(holding_bridge.format_capabilities = ast_format_cap_alloc())) { + if (!(holding_bridge.format_capabilities = ast_format_cap_alloc(0))) { return AST_MODULE_LOAD_DECLINE; } ast_format_cap_add_all_by_type(holding_bridge.format_capabilities, AST_FORMAT_TYPE_AUDIO); diff --git a/bridges/bridge_native_rtp.c b/bridges/bridge_native_rtp.c index c8bf880b6..7775d41ec 100644 --- a/bridges/bridge_native_rtp.c +++ b/bridges/bridge_native_rtp.c @@ -124,8 +124,8 @@ static int native_rtp_bridge_start(struct ast_bridge *bridge, struct ast_channel RAII_VAR(struct ast_rtp_instance *, vinstance1, NULL, ao2_cleanup); RAII_VAR(struct ast_rtp_instance *, tinstance0, NULL, ao2_cleanup); RAII_VAR(struct ast_rtp_instance *, tinstance1, NULL, ao2_cleanup); - RAII_VAR(struct ast_format_cap *, cap0, ast_format_cap_alloc_nolock(), ast_format_cap_destroy); - RAII_VAR(struct ast_format_cap *, cap1, ast_format_cap_alloc_nolock(), ast_format_cap_destroy); + RAII_VAR(struct ast_format_cap *, cap0, ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_NOLOCK), ast_format_cap_destroy); + RAII_VAR(struct ast_format_cap *, cap1, ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_NOLOCK), ast_format_cap_destroy); if (c0 == c1) { return 0; @@ -279,8 +279,8 @@ static int native_rtp_bridge_compatible(struct ast_bridge *bridge) RAII_VAR(struct ast_rtp_instance *, instance1, NULL, ao2_cleanup); RAII_VAR(struct ast_rtp_instance *, vinstance0, NULL, ao2_cleanup); RAII_VAR(struct ast_rtp_instance *, vinstance1, NULL, ao2_cleanup); - RAII_VAR(struct ast_format_cap *, cap0, ast_format_cap_alloc_nolock(), ast_format_cap_destroy); - RAII_VAR(struct ast_format_cap *, cap1, ast_format_cap_alloc_nolock(), ast_format_cap_destroy); + RAII_VAR(struct ast_format_cap *, cap0, ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_NOLOCK), ast_format_cap_destroy); + RAII_VAR(struct ast_format_cap *, cap1, ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_NOLOCK), ast_format_cap_destroy); int read_ptime0, read_ptime1, write_ptime0, write_ptime1; /* We require two channels before even considering native bridging */ @@ -448,7 +448,7 @@ static int unload_module(void) static int load_module(void) { - if (!(native_rtp_bridge.format_capabilities = ast_format_cap_alloc())) { + if (!(native_rtp_bridge.format_capabilities = ast_format_cap_alloc(0))) { return AST_MODULE_LOAD_DECLINE; } ast_format_cap_add_all_by_type(native_rtp_bridge.format_capabilities, AST_FORMAT_TYPE_AUDIO); diff --git a/bridges/bridge_simple.c b/bridges/bridge_simple.c index 78ac7a4ae..4a03dbe10 100644 --- a/bridges/bridge_simple.c +++ b/bridges/bridge_simple.c @@ -82,7 +82,7 @@ static int unload_module(void) static int load_module(void) { - if (!(simple_bridge.format_capabilities = ast_format_cap_alloc())) { + if (!(simple_bridge.format_capabilities = ast_format_cap_alloc(0))) { return AST_MODULE_LOAD_DECLINE; } ast_format_cap_add_all_by_type(simple_bridge.format_capabilities, AST_FORMAT_TYPE_AUDIO); diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index c6cde396d..b7cce866c 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -1137,7 +1137,7 @@ static int unload_module(void) static int load_module(void) { struct ast_format tmp; - if (!(softmix_bridge.format_capabilities = ast_format_cap_alloc())) { + if (!(softmix_bridge.format_capabilities = ast_format_cap_alloc(0))) { return AST_MODULE_LOAD_DECLINE; } ast_format_cap_add(softmix_bridge.format_capabilities, ast_format_set(&tmp, AST_FORMAT_SLINEAR, 0)); |