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 /addons/chan_ooh323.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 'addons/chan_ooh323.c')
-rw-r--r-- | addons/chan_ooh323.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index a23eafb80..5fa3ae566 100644 --- a/addons/chan_ooh323.c +++ b/addons/chan_ooh323.c @@ -169,9 +169,9 @@ static struct ooh323_pvt { char callee_url[AST_MAX_EXTENSION]; int port; - int readformat; /* negotiated read format */ - int writeformat; /* negotiated write format */ - int capability; + format_t readformat; /* negotiated read format */ + format_t writeformat; /* negotiated write format */ + format_t capability; struct ast_codec_pref prefs; int dtmfmode; int dtmfcodec; @@ -3673,7 +3673,7 @@ int ooh323_update_capPrefsOrderForCall } -int ooh323_convertAsteriskCapToH323Cap(int cap) +int ooh323_convertAsteriskCapToH323Cap(format_t cap) { char formats[FORMAT_STRING_SIZE]; switch (cap) { @@ -3744,7 +3744,8 @@ int configure_local_rtp(struct ooh323_pvt *p, ooCallData *call) { struct sockaddr_in us; ooMediaInfo mediaInfo; - int x, format = 0; + int x; + format_t format = 0; if (gH323Debug) ast_verbose("--- configure_local_rtp\n"); |