summaryrefslogtreecommitdiff
path: root/pjmedia
diff options
context:
space:
mode:
authorLiong Sauw Ming <ming@teluu.com>2012-04-26 03:39:24 +0000
committerLiong Sauw Ming <ming@teluu.com>2012-04-26 03:39:24 +0000
commit2756757e494bc8529aa63cf8c51e371ef7b736a0 (patch)
tree838c33a5f5af80f913591762e2d59430705bf1e5 /pjmedia
parent794e93a6f3e461f4eee7b4f2ebe07cdd91828498 (diff)
Re #1446 (misc): Disable SDL by default on iOS and fixed various compiler warnings.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4087 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
-rw-r--r--pjmedia/src/pjmedia/converter.c2
-rw-r--r--pjmedia/src/pjmedia/format.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/pjmedia/src/pjmedia/converter.c b/pjmedia/src/pjmedia/converter.c
index 14496fa0..436f0bd3 100644
--- a/pjmedia/src/pjmedia/converter.c
+++ b/pjmedia/src/pjmedia/converter.c
@@ -39,7 +39,7 @@ PJ_DEF(pj_status_t) pjmedia_converter_mgr_create(pj_pool_t *pool,
pjmedia_converter_mgr **p_mgr)
{
pjmedia_converter_mgr *mgr;
- pj_status_t status;
+ pj_status_t status = PJ_SUCCESS;
mgr = PJ_POOL_ALLOC_T(pool, pjmedia_converter_mgr);
pj_list_init(&mgr->factory_list);
diff --git a/pjmedia/src/pjmedia/format.c b/pjmedia/src/pjmedia/format.c
index 54fd4dba..49369c0b 100644
--- a/pjmedia/src/pjmedia/format.c
+++ b/pjmedia/src/pjmedia/format.c
@@ -53,6 +53,10 @@ pjmedia_format_get_audio_format_detail(const pjmedia_format *fmt,
if (fmt->detail_type==PJMEDIA_FORMAT_DETAIL_AUDIO) {
return (pjmedia_audio_format_detail*) &fmt->det.aud;
} else {
+ /* Get rid of unused var compiler warning if pj_assert()
+ * macro does not do anything
+ */
+ PJ_UNUSED_ARG(assert_valid);
pj_assert(!assert_valid || !"Invalid audio format detail");
return NULL;
}