From b633aa4bf3210efdc3ff4051831de8291f43ba22 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Wed, 4 Apr 2012 10:07:18 +0000 Subject: More re #1478: fixed build config and compile warnings on MSVC2005. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4021 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/build/pjmedia_videodev.vcproj | 344 +++++++++++++++++---------------- pjmedia/src/pjmedia-videodev/avi_dev.c | 12 +- 2 files changed, 181 insertions(+), 175 deletions(-) (limited to 'pjmedia') diff --git a/pjmedia/build/pjmedia_videodev.vcproj b/pjmedia/build/pjmedia_videodev.vcproj index 54d14f20..ccec90e7 100644 --- a/pjmedia/build/pjmedia_videodev.vcproj +++ b/pjmedia/build/pjmedia_videodev.vcproj @@ -225,12 +225,12 @@ /> + + + + - - + + + + - - + + - - - - - - + + @@ -2833,6 +2837,10 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl" > + + diff --git a/pjmedia/src/pjmedia-videodev/avi_dev.c b/pjmedia/src/pjmedia-videodev/avi_dev.c index c34f5886..770f4f25 100644 --- a/pjmedia/src/pjmedia-videodev/avi_dev.c +++ b/pjmedia/src/pjmedia-videodev/avi_dev.c @@ -284,7 +284,7 @@ static void reset_dev_info(struct avi_dev_info *adi) PJ_DEF(pj_status_t) pjmedia_avi_dev_free(pjmedia_vid_dev_index id) { pjmedia_vid_dev_factory *f; - struct avi_factory *cf = (struct avi_factory*)f; + struct avi_factory *cf; unsigned local_idx; struct avi_dev_info *adi; pj_status_t status; @@ -465,7 +465,6 @@ static pj_status_t avi_factory_create_stream( pj_pool_t *pool = NULL; struct avi_dev_info *adi; struct avi_dev_strm *strm; - pj_status_t status; PJ_ASSERT_RETURN(f && param && p_vid_strm, PJ_EINVAL); PJ_ASSERT_RETURN(param->fmt.type == PJMEDIA_TYPE_VIDEO && @@ -500,11 +499,6 @@ static pj_status_t avi_factory_create_stream( *p_vid_strm = &strm->base; return PJ_SUCCESS; - -on_error: - if (pool) - pj_pool_release(pool); - return status; } /* API: Get stream info. */ @@ -528,6 +522,8 @@ static pj_status_t avi_dev_strm_get_cap(pjmedia_vid_dev_stream *s, struct avi_dev_strm *strm = (struct avi_dev_strm*)s; PJ_UNUSED_ARG(strm); + PJ_UNUSED_ARG(cap); + PJ_UNUSED_ARG(pval); PJ_ASSERT_RETURN(s && pval, PJ_EINVAL); @@ -542,6 +538,8 @@ static pj_status_t avi_dev_strm_set_cap(pjmedia_vid_dev_stream *s, struct avi_dev_strm *strm = (struct avi_dev_strm*)s; PJ_UNUSED_ARG(strm); + PJ_UNUSED_ARG(cap); + PJ_UNUSED_ARG(pval); PJ_ASSERT_RETURN(s && pval, PJ_EINVAL); -- cgit v1.2.3