diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2011-07-19 08:40:20 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2011-07-19 08:40:20 +0000 |
| commit | 262defe8ad75325065fd64ea5d3a03a59c5f3039 (patch) | |
| tree | 02c1f3392feb9bc494107f530634551d566ebc40 /pjmedia | |
| parent | f9cf39df6f56b0c550ea97d9a024e2fc32d55c0e (diff) | |
Re #1326:
- Fixed compile warnings on vs2005
- Fixed compile error when PJMEDIA_HAS_VIDEO set to 0 on vs2005
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3666 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/include/pjmedia-codec/audio_codecs.h | 4 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/event.c | 3 | ||||
| -rw-r--r-- | pjmedia/src/test/vid_dev_test.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/test/vid_port_test.c | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/pjmedia/include/pjmedia-codec/audio_codecs.h b/pjmedia/include/pjmedia-codec/audio_codecs.h index 2a651e95..e74bd3c9 100644 --- a/pjmedia/include/pjmedia-codec/audio_codecs.h +++ b/pjmedia/include/pjmedia-codec/audio_codecs.h @@ -48,8 +48,8 @@ typedef struct pjmedia_audio_codec_config /** Speex codec settings. See #pjmedia_codec_speex_init() for more info */ struct { unsigned option; /**< Bitmask of options. */ - unsigned quality; /**< Codec quality. */ - unsigned complexity; /**< Codec complexity. */ + int quality; /**< Codec quality. */ + int complexity; /**< Codec complexity. */ } speex; /** iLBC settings */ diff --git a/pjmedia/src/pjmedia/event.c b/pjmedia/src/pjmedia/event.c index fee0917e..30df9541 100644 --- a/pjmedia/src/pjmedia/event.c +++ b/pjmedia/src/pjmedia/event.c @@ -107,6 +107,9 @@ PJ_DEF(pj_status_t) pjmedia_event_publish( pjmedia_event_publisher *epub, TRACE_((THIS_FILE, "Event %s is published by publisher %s", pjmedia_fourcc_name(event->type, event_name), pjmedia_fourcc_name(epub->sig, epub_name))); + /* Suppress compiler warning if trace is disabled */ + PJ_UNUSED_ARG(event_name); + PJ_UNUSED_ARG(epub_name); esub = epub->subscription_list.next; if (!esub) diff --git a/pjmedia/src/test/vid_dev_test.c b/pjmedia/src/test/vid_dev_test.c index 36966047..0b4572a5 100644 --- a/pjmedia/src/test/vid_dev_test.c +++ b/pjmedia/src/test/vid_dev_test.c @@ -75,6 +75,8 @@ static int enum_devs(void) static pj_status_t vid_event_cb(pjmedia_event_subscription *esub, pjmedia_event *event) { + PJ_UNUSED_ARG(esub); + if (event->type == PJMEDIA_EVENT_WND_CLOSED) is_quitting = PJ_TRUE; diff --git a/pjmedia/src/test/vid_port_test.c b/pjmedia/src/test/vid_port_test.c index cd7acd8d..5d04e24b 100644 --- a/pjmedia/src/test/vid_port_test.c +++ b/pjmedia/src/test/vid_port_test.c @@ -31,6 +31,8 @@ static pj_bool_t is_quitting = PJ_FALSE; static pj_status_t vid_event_cb(pjmedia_event_subscription *esub, pjmedia_event *event) { + PJ_UNUSED_ARG(esub); + if (event->type == PJMEDIA_EVENT_WND_CLOSED) is_quitting = PJ_TRUE; @@ -46,7 +48,6 @@ static int capture_render_loopback(pj_bool_t active, pjmedia_vid_dev_info cdi, rdi; pjmedia_vid_port_param param; pjmedia_video_format_detail *vfd; - pjmedia_vid_dev_cb cb; pjmedia_event_subscription esub; pj_status_t status; int rc = 0, i; @@ -180,7 +181,6 @@ static int vidport_test(void) PJMEDIA_FORMAT_RGBA, PJMEDIA_FORMAT_I420 }; - pj_status_t status; PJ_LOG(3, (THIS_FILE, " Video port tests:")); |