diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-21 16:44:49 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-21 16:44:49 +0000 |
| commit | 2f088bf0ec8c78e874ef913bdb694c9ba6152729 (patch) | |
| tree | 233fc1c8f5d9bd9ffedc123671b0cea898b45e93 | |
| parent | 7a9aa43ca457c72810cfdc8ce6155f4b049bcc8d (diff) | |
Revert 225169, as this doesn't account for the possibility of a list of frames.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@225171 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 9ee2f664f..a928470bf 100644 --- a/main/translate.c +++ b/main/translate.c @@ -301,7 +301,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; @@ -370,11 +370,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 */ |