[svn-commits] file: trunk r66109 - in /trunk: ./ main/slinfactory.c

[svn-commits at lists.digium.com]

Author: file
Date: Thu May 24 20:37:50 2007
New Revision: 66109

URL: http://svn.digium.com/view/asterisk?view=rev&rev=66109
Log:
Merged revisions 66074 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r66074 | file | 2007-05-24 18:16:58 -0400 (Thu, 24 May 2007) | 2 lines

Fix slinfactory logic when dealing with frames coming in that may already be in the signed linear format.

........

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

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

Modified: trunk/main/slinfactory.c
URL: http://svn.digium.com/view/asterisk/trunk/main/slinfactory.c?view=diff&rev=66109&r1=66108&r2=66109
==============================================================================
--- trunk/main/slinfactory.c (original)
+++ trunk/main/slinfactory.c Thu May 24 20:37:50 2007
@@ -72,10 +72,12 @@
 				sf->format = f->subclass;
 			}
 		}
+		if (!(begin_frame = ast_translate(sf->trans, f, 0)) || !(duped_frame = ast_frdup(begin_frame)))
+			return 0;
+	} else {
+		if (!(duped_frame = ast_frdup(f)))
+			return 0;
 	}
-
-	if ((sf->trans && (!(begin_frame = ast_translate(sf->trans, f, 0)))) || (!(duped_frame = ast_frdup(begin_frame))))
-		return 0;
 
 	x = 0;
 	AST_LIST_TRAVERSE(&sf->queue, frame_ptr, frame_list)