aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-09 15:47:25 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-09 15:47:25 +0000
commit035e7c7398c453153950670268f6de549f2ec517 (patch)
tree8db8d79390976a68b67d0f348029089b4fc7d944 /include
parent58ec09b8c3ae8f0bbfed68373baf3eaf48db6d9a (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.1@205596 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/frame.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index b6a8c6924..148806b55 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;