From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 21 Oct 2009 16:46:22 +0000 (+0000)
Subject: Merged revisions 225171 via svnmerge from
X-Git-Tag: 11.0.0-beta1~3998
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ebf7767d0c7fe090b4dd41e110a18988b99985c;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/trunk@225172 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/translate.c b/main/translate.c
index 223b5d30e7..a4a915291f 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 */