diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-21 16:46:22 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-21 16:46:22 +0000 |
| commit | 02992ab88835322a8f97bd9f26ddde84c43e91d3 (patch) | |
| tree | 9f91b6fee27e40b46fbbe9f80d142df883a05bcd /main | |
| parent | 9a8be3b582156f007d9d86e8d5de2133f3056eff (diff) | |
Merged revisions 225171 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r225171 | russell | 2009-10-21 11:44:49 -0500 (Wed, 21 Oct 2009) | 2 lines
Revert 225169, as this doesn't account for the possibility of a list of frames.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@225172 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/translate.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/main/translate.c b/main/translate.c index 223b5d30e..a4a915291 100644 --- a/main/translate.c +++ b/main/translate.c @@ -295,7 +295,7 @@ struct ast_trans_pvt *ast_translator_build_path(int dest, int source) struct ast_frame *ast_translate(struct ast_trans_pvt *path, struct ast_frame *f, int consume) { struct ast_trans_pvt *p = path; - struct ast_frame *out = f, *ret; + struct ast_frame *out = f; struct timeval delivery; int has_timing_info; long ts; @@ -364,11 +364,7 @@ struct ast_frame *ast_translate(struct ast_trans_pvt *path, struct ast_frame *f, /* Invalidate prediction if we're entering a silence period */ if (out->frametype == AST_FRAME_CNG) path->nextout = ast_tv(0, 0); - - ret = ast_frisolate(out); - ast_frfree(out); - - return ret; + return out; } /*! \brief compute the cost of a single translation step */ |