]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 98774 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Mon, 14 Jan 2008 17:39:31 +0000 (17:39 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 14 Jan 2008 17:39:31 +0000 (17:39 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r98774 | russell | 2008-01-14 11:38:38 -0600 (Mon, 14 Jan 2008) | 3 lines

Revert a change that introduces an unacceptable performance hit and is causing
memory leaks ... (from rev 97973)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@98775 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/translate.c

index 6c27e4e241a3943ccbde1e12b2204e9c0e5c1ebb..2e98df92b2b6ee44340b3d0d495bffc3929ca599 100644 (file)
@@ -225,10 +225,8 @@ struct ast_frame *ast_trans_frameout(struct ast_trans_pvt *pvt,
        f->offset = AST_FRIENDLY_OFFSET;
        f->src = pvt->t->name;
        f->data = pvt->outbuf;
-       /* We must clone the frame, because the pvt could disappear
-        * the moment after we return (and unlock the source channel).
-        */
-       return ast_frisolate(f);
+
+       return f;
 }
 
 static struct ast_frame *default_frameout(struct ast_trans_pvt *pvt)