[svn-commits] russell: trunk r225172 - in /trunk: ./ main/translate.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Oct 21 11:46:22 2009
New Revision: 225172

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=225172
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/main/translate.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/translate.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/translate.c?view=diff&rev=225172&r1=225171&r2=225172
==============================================================================
--- trunk/main/translate.c (original)
+++ trunk/main/translate.c Wed Oct 21 11:46:22 2009
@@ -295,7 +295,7 @@
 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 @@
 	/* 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 */