automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@10430 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/app.c b/app.c
index 95347a27e5b9a9381de2a580023d6e306c8948a9..af0f6c35565c6e5a49ceb3f665a50e200df18423 100644 (file)
--- a/app.c
+++ b/app.c
@@ -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) {