From 560d8dba3b98b2a5ae65da01b5021757eb366888 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Sun, 22 Apr 2007 12:48:30 +0000 Subject: Merged changes from the trunk git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/split-3rd-party@1210 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/include/pjmedia/alaw_ulaw.h | 4 +++- pjmedia/src/pjmedia/alaw_ulaw.c | 2 +- pjmedia/src/pjmedia/sdp.c | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) (limited to 'pjmedia') 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 +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; iname, 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 -- cgit v1.2.3