[asterisk-commits] file: branch 1.4 r66074 - /branches/1.4/main/slinfactory.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Thu May 24 17:16:58 2007
New Revision: 66074

URL: http://svn.digium.com/view/asterisk?view=rev&rev=66074
Log:
Fix slinfactory logic when dealing with frames coming in that may already be in the signed linear format.

Modified:
    branches/1.4/main/slinfactory.c

Modified: branches/1.4/main/slinfactory.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/slinfactory.c?view=diff&rev=66074&r1=66073&r2=66074
==============================================================================
--- branches/1.4/main/slinfactory.c (original)
+++ branches/1.4/main/slinfactory.c Thu May 24 17:16:58 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)