[asterisk-commits] oej: branch oej/obproxy r99295 - in /team/oej/obproxy: ./ include/asterisk/ m...

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Jan 21 01:24:36 2008
New Revision: 99295

URL: http://svn.digium.com/view/asterisk?view=rev&rev=99295
Log:
Reset, resolve

Modified:
    team/oej/obproxy/   (props changed)
    team/oej/obproxy/include/asterisk/channel.h
    team/oej/obproxy/main/slinfactory.c

Change Statistics:
 team/oej/obproxy/include/asterisk/channel.h |    5 ++---
 team/oej/obproxy/main/slinfactory.c         |   11 ++++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

Propchange: team/oej/obproxy/
------------------------------------------------------------------------------
    automerge = http://www.codename-pineapple.org/

Propchange: team/oej/obproxy/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 21 01:24:36 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-99105
+/branches/1.4:1-99289

Modified: team/oej/obproxy/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/team/oej/obproxy/include/asterisk/channel.h?view=diff&rev=99295&r1=99294&r2=99295
==============================================================================
--- team/oej/obproxy/include/asterisk/channel.h (original)
+++ team/oej/obproxy/include/asterisk/channel.h Mon Jan 21 01:24:36 2008
@@ -428,9 +428,8 @@
 	int rawwriteformat;				/*!< Raw write format */
 
 	struct ast_audiohook_list *audiohooks;
-	/*! This pointer should stay for Asterisk 1.4.  It just keeps the struct size the same
-	 *  for the sake of ABI compatability. */
-	void *__skrep;
+	void *unused; /*! This pointer should stay for Asterisk 1.4.  It just keeps the struct size the same
+			 *  for the sake of ABI compatability. */
 
 	AST_LIST_ENTRY(ast_channel) chan_list;		/*!< For easy linking */
 	

Modified: team/oej/obproxy/main/slinfactory.c
URL: http://svn.digium.com/view/asterisk/team/oej/obproxy/main/slinfactory.c?view=diff&rev=99295&r1=99294&r2=99295
==============================================================================
--- team/oej/obproxy/main/slinfactory.c (original)
+++ team/oej/obproxy/main/slinfactory.c Mon Jan 21 01:24:36 2008
@@ -64,6 +64,7 @@
 			ast_translator_free_path(sf->trans);
 			sf->trans = NULL;
 		}
+
 		if (!sf->trans) {
 			if ((sf->trans = ast_translator_build_path(AST_FORMAT_SLINEAR, f->subclass)) == NULL) {
 				ast_log(LOG_WARNING, "Cannot build a path from %s to slin\n", ast_getformatname(f->subclass));
@@ -72,7 +73,15 @@
 				sf->format = f->subclass;
 			}
 		}
-		if (!(begin_frame = ast_translate(sf->trans, f, 0)) || !(duped_frame = ast_frdup(begin_frame)))
+
+		if (!(begin_frame = ast_translate(sf->trans, f, 0))) 
+			return 0;
+		
+		duped_frame = ast_frdup(begin_frame);
+
+		ast_frfree(begin_frame);
+
+		if (!duped_frame)
 			return 0;
 	} else {
 		if (!(duped_frame = ast_frdup(f)))