[asterisk-commits] file: trunk r47861 - in /trunk: ./ main/frame.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon Nov 20 13:52:38 2006
New Revision: 47861

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

................
r47860 | file | 2006-11-20 14:51:36 -0500 (Mon, 20 Nov 2006) | 10 lines

Merged revisions 47859 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r47859 | file | 2006-11-20 14:50:21 -0500 (Mon, 20 Nov 2006) | 2 lines

Don't forget to byte swap if we are exiting the smoother feed early. (issue #8287 reported by arturs)

........

................

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

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

Propchange: trunk/
------------------------------------------------------------------------------
    svnmerge-integrated = /branches/1.4:1-47483

Modified: trunk/main/frame.c
URL: http://svn.digium.com/view/asterisk/trunk/main/frame.c?view=diff&rev=47861&r1=47860&r2=47861
==============================================================================
--- trunk/main/frame.c (original)
+++ trunk/main/frame.c Mon Nov 20 13:52:38 2006
@@ -188,6 +188,8 @@
 			/* Optimize by sending the frame we just got
 			   on the next read, thus eliminating the douple
 			   copy */
+			if (swap)
+				ast_swapcopy_samples(f->data, f->data, f->samples);
 			s->opt = f;
 			return 0;
 		} else {
@@ -198,6 +200,8 @@
 				   we were unable to optimize because there was still
 				   some cruft left over.  Lets just drop the cruft so
 				   we can move to a fully optimized path */
+				if (swap)
+					ast_swapcopy_samples(f->data, f->data, f->samples);
 				s->len = 0;
 				s->opt = f;
 				return 0;