[svn-commits] qwell: branch 1.6.0 r111291 - in /branches/1.6.0: ./ main/frame.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Wed Mar 26 19:26:58 2008
New Revision: 111291

URL: http://svn.digium.com/view/asterisk?view=rev&rev=111291
Log:
Merged revisions 111285 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r111285 | qwell | 2008-03-26 19:25:56 -0500 (Wed, 26 Mar 2008) | 9 lines

Merged revisions 111280 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r111280 | qwell | 2008-03-26 19:25:13 -0500 (Wed, 26 Mar 2008) | 1 line

Put this flag back so we don't change the API.
........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/frame.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/frame.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/frame.c?view=diff&rev=111291&r1=111290&r2=111291
==============================================================================
--- branches/1.6.0/main/frame.c (original)
+++ branches/1.6.0/main/frame.c Wed Mar 26 19:26:58 2008
@@ -85,6 +85,7 @@
 	int size;
 	int format;
 	int readdata;
+	int optimizablestream;
 	int flags;
 	float samplesperbyte;
 	struct ast_frame f;