diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-20 18:20:39 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-20 18:20:39 +0000 |
| commit | 319c28addab3857ac3e71bd8eee0576e4ad6fea4 (patch) | |
| tree | b2955b469882f04e0ec301bf3cb8fa0c0a348c9a /include/asterisk/frame.h | |
| parent | 0ae1e2c5118f3f315175015c03cf9767459c735b (diff) | |
Merged revisions 158133 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r158133 | mmichelson | 2008-11-20 12:20:00 -0600 (Thu, 20 Nov 2008) | 10 lines
Merged revisions 158072 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r158072 | twilson | 2008-11-20 11:48:58 -0600 (Thu, 20 Nov 2008) | 2 lines
Begin on a crusade to end trailing whitespace!
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@158134 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/frame.h')
| -rw-r--r-- | include/asterisk/frame.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h index 96a9ca8e7..267a820e8 100644 --- a/include/asterisk/frame.h +++ b/include/asterisk/frame.h @@ -134,6 +134,10 @@ enum { * The dsp cannot be free'd if the frame inside of it still has * this flag set. */ AST_FRFLAG_FROM_DSP = (1 << 2), + /*! This frame came from a filestream and is still the original frame. + * The filestream cannot be free'd if the frame inside of it still has + * this flag set. */ + AST_FRFLAG_FROM_FILESTREAM = (1 << 3), }; /*! \brief Data structure associated with a single frame of data |