diff options
author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-09 15:57:28 +0000 |
---|---|---|
committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-09 15:57:28 +0000 |
commit | 485584f72137a9ecfa3babfca760a9efdb23c572 (patch) | |
tree | fc53c14d40176ffec5f5962a68bc07646484af07 /include | |
parent | 66f271b74cdc2700bf653c475d1edb52df18fb92 (diff) |
Merged revisions 205479 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r205479 | dvossel | 2009-07-08 18:19:09 -0500 (Wed, 08 Jul 2009) | 16 lines
Merged revisions 205471 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r205471 | dvossel | 2009-07-08 18:15:54 -0500 (Wed, 08 Jul 2009) | 10 lines
Fixes 8khz assumptions
Many calculations assume 8khz is the codec rate. This
is not always the case. This patch only addresses chan_iax.c
and res_rtp_asterisk.c, but I am sure there are other areas
that make this assumption as well.
Review: https://reviewboard.asterisk.org/r/306/
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@205597 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/frame.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h index 18f8c18b6..042dd222c 100644 --- a/include/asterisk/frame.h +++ b/include/asterisk/frame.h @@ -149,7 +149,7 @@ struct ast_frame { int subclass; /*! Length of data */ int datalen; - /*! Number of 8khz samples in this frame */ + /*! Number of samples in this frame */ int samples; /*! Was the data malloc'd? i.e. should we free it when we discard the frame? */ int mallocd; |