automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@10430 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-02-18 01:03:27 +00:00
parent 304e39b8ec
commit e098adeaf7

2
app.c
View File

@@ -847,6 +847,7 @@ int ast_play_and_prepend(struct ast_channel *chan, char *playfile, char *recordf
res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);
if (res < 0) {
ast_log(LOG_WARNING, "Unable to set to linear mode, giving up\n");
ast_dsp_free(sildet);
return -1;
}
}
@@ -951,6 +952,7 @@ int ast_play_and_prepend(struct ast_channel *chan, char *playfile, char *recordf
} else {
ast_log(LOG_WARNING, "Error creating writestream '%s', format '%s'\n", prependfile, sfmt[x]);
}
ast_dsp_free(sildet);
*duration = end - start;
#if 0
if (outmsg > 1) {