diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-01 20:27:37 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-01 20:27:37 +0000 |
| commit | f4d89e410ae1f1df4247b72ed19a97222113e8e7 (patch) | |
| tree | 72344fb3a18484772df8f496cc1f9be6e902c64f /channels/chan_dahdi.c | |
| parent | f925470a1b0577798cad89472fbc14657a6a4d58 (diff) | |
More 32->64 bit codec conversions.
In the process of swapping ULAW to a place in the extended codec space, we
found several unhandled cases, where a 32-bit integer was still being used to
handle a codec field. Most of these have been fixed with this commit, although
there is at least one case (codec_dahdi) which depends upon outside headers to
be altered before a conversion can be made.
(Fixes AST-278, SWP-459)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@231850 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 0da2ded8c..40e7de230 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -8527,7 +8527,7 @@ static int dahdi_indicate(struct ast_channel *chan, int condition, const void *d static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpbx, int idx, int law, int transfercapability, const char *linkedid) { struct ast_channel *tmp; - int deflaw; + format_t deflaw; int res; int x,y; int features; @@ -9909,7 +9909,7 @@ struct mwi_thread_data { size_t len; }; -static int calc_energy(const unsigned char *buf, int len, int law) +static int calc_energy(const unsigned char *buf, int len, format_t law) { int x; int sum = 0; |