From: Jason Parker <jparker@digium.com>
Date: Thu, 27 Mar 2008 00:25:56 +0000 (+0000)
Subject: Merged revisions 111280 via svnmerge from
X-Git-Tag: 1.6.0-beta7~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02710882799c36cd5529bb29a183d864aa1e1416;p=thirdparty%2Fasterisk.git

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.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@111285 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/frame.c b/main/frame.c
index 3971393fd2..07ce936f2c 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -85,6 +85,7 @@ struct ast_smoother {
 	int size;
 	int format;
 	int readdata;
+	int optimizablestream;
 	int flags;
 	float samplesperbyte;
 	struct ast_frame f;