summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2017-11-21 10:53:59 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-11-21 10:53:59 -0600
commit1e2799f491b670d6836c2f7ce9d53c3c670e3bc3 (patch)
treeffb29706309425a39e932f6756871a18238782b8
parent69fcd96e7213ab992bfc04bab190ace7dfe82f0a (diff)
parent3c3c0140a3fa6f6a1bfa446a658483c5cd7aed29 (diff)
Merge "abstract_jb: Remove silly usage of RAII_VAR." into 15
-rw-r--r--main/abstract_jb.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/abstract_jb.c b/main/abstract_jb.c
index 0f0e6613f..b375739a4 100644
--- a/main/abstract_jb.c
+++ b/main/abstract_jb.c
@@ -443,7 +443,7 @@ static int create_jb(struct ast_channel *chan, struct ast_frame *frr)
/* Create a frame log file */
if (ast_test_flag(jbconf, AST_JB_LOG)) {
- RAII_VAR(struct ast_channel *, bridged, ast_channel_bridge_peer(chan), ast_channel_cleanup);
+ struct ast_channel *bridged = ast_channel_bridge_peer(chan);
char safe_logfile[30] = "/tmp/logfile-XXXXXX";
int safe_fd;
@@ -479,6 +479,8 @@ static int create_jb(struct ast_channel *chan, struct ast_frame *frr)
jb_framelog("JB_PUT_FIRST {now=%ld}: Dropped frame with ts=%ld and len=%ld\n",
now, frr->ts, frr->len);
}
+
+ ast_channel_cleanup(bridged);
}
ast_verb(3, "%s jitterbuffer created on channel %s\n", jbimpl->name, ast_channel_name(chan));