diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-04-22 12:48:30 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-04-22 12:48:30 +0000 |
| commit | 560d8dba3b98b2a5ae65da01b5021757eb366888 (patch) | |
| tree | 2b947a42f03be862b6fa1a45ce1e95723cee0ac1 /pjmedia | |
| parent | 44d9c946fc77600985b869552887497c2a539d5c (diff) | |
Merged changes from the trunk
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/split-3rd-party@1210 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/include/pjmedia/alaw_ulaw.h | 4 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/alaw_ulaw.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/sdp.c | 9 |
3 files changed, 10 insertions, 5 deletions
diff --git a/pjmedia/include/pjmedia/alaw_ulaw.h b/pjmedia/include/pjmedia/alaw_ulaw.h index 5cafa842..14f10495 100644 --- a/pjmedia/include/pjmedia/alaw_ulaw.h +++ b/pjmedia/include/pjmedia/alaw_ulaw.h @@ -21,6 +21,8 @@ #include <pjmedia/types.h> +PJ_BEGIN_DECL + #if defined(PJMEDIA_HAS_ALAW_ULAW_TABLE) && PJMEDIA_HAS_ALAW_ULAW_TABLE!=0 extern const pj_uint8_t pjmedia_linear2ulaw_tab[16384]; @@ -134,9 +136,9 @@ PJ_DECL(unsigned char) pjmedia_alaw2ulaw(unsigned char aval); */ PJ_DECL(unsigned char) pjmedia_ulaw2alaw(unsigned char uval); - #endif +PJ_END_DECL #endif /* __PJMEDIA_ALAW_ULAW_H__ */ diff --git a/pjmedia/src/pjmedia/alaw_ulaw.c b/pjmedia/src/pjmedia/alaw_ulaw.c index 1841192a..5fd97479 100644 --- a/pjmedia/src/pjmedia/alaw_ulaw.c +++ b/pjmedia/src/pjmedia/alaw_ulaw.c @@ -154,7 +154,7 @@ pjmedia_linear2alaw( */ PJ_DEF(int) pjmedia_alaw2linear( - unsigned char a_val) + unsigned a_val) { int t; int seg; diff --git a/pjmedia/src/pjmedia/sdp.c b/pjmedia/src/pjmedia/sdp.c index 0ef241b9..d9cc8289 100644 --- a/pjmedia/src/pjmedia/sdp.c +++ b/pjmedia/src/pjmedia/sdp.c @@ -138,14 +138,17 @@ pjmedia_sdp_attr_find (unsigned count, const pj_str_t *c_fmt) { unsigned i; + unsigned c_pt = 0xFFFF; + + if (c_fmt) + c_pt = pj_strtoul(c_fmt); for (i=0; i<count; ++i) { if (pj_strcmp(&attr_array[i]->name, name) == 0) { const pjmedia_sdp_attr *a = attr_array[i]; if (c_fmt) { - if (a->value.slen > c_fmt->slen && - pj_strncmp(&a->value, c_fmt, c_fmt->slen)==0) - { + unsigned pt = (unsigned) pj_strtoul2(&a->value, NULL, 10); + if (pt == c_pt) { return (pjmedia_sdp_attr*)a; } } else |