diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-27 00:26:58 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-27 00:26:58 +0000 |
commit | 2259666f5261346037c5a6fa0d3a5da67a7eca00 (patch) | |
tree | f0eb0213c3a9b251bec33478fb4b7893aeead643 /main/frame.c | |
parent | ae2f2e4dc35ff19676262e8ff7d7e7b43c03ae91 (diff) |
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.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@111291 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/frame.c')
-rw-r--r-- | main/frame.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/frame.c b/main/frame.c index 3971393fd..07ce936f2 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; |