summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2006-01-31 17:18:58 +0000
committerRussell Bryant <russell@russellbryant.com>2006-01-31 17:18:58 +0000
commite01861fafd6f74f65f2cb4ac90b811a9bb0a52c7 (patch)
tree5d573d837383e784c67dabc01fcfad5e8aec9801 /apps
parent18eac350afb23f696f4c56233b6a18094b201041 (diff)
define a global null_frame object so when queueing a null frame, you don't
have to allocate one on the stack git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9001 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/app_meetme.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 205b5ac4a..7fd41c26f 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -206,7 +206,6 @@ enum volume_action {
};
static int admin_exec(struct ast_channel *chan, void *data);
-static struct ast_frame null_frame = { AST_FRAME_NULL, };
static void *recordthread(void *args);
@@ -1574,7 +1573,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
if (conf->transpath[index]) {
conf->transframe[index] = ast_translate(conf->transpath[index], conf->origframe, 0);
if (!conf->transframe[index])
- conf->transframe[index] = &null_frame;
+ conf->transframe[index] = &ast_null_frame;
}
}
}