diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2015-04-10 11:47:48 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2015-04-10 11:47:48 +0000 |
commit | ba679d84270333cbf4f6cb245b8edb7c2b442e33 (patch) | |
tree | 7acdda4c7a1ef0d05fcb72892c0d091880488f1a | |
parent | 9a8222497b42c39e316b24059a8413c22396c72d (diff) |
Misc (re #1782): Suppress compile warnings on MSVC.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5060 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r-- | pjlib/src/pjlib-test/exception.c | 4 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-codec/g7221.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pjlib/src/pjlib-test/exception.c b/pjlib/src/pjlib-test/exception.c index 26546ef2..2d164ade 100644 --- a/pjlib/src/pjlib-test/exception.c +++ b/pjlib/src/pjlib-test/exception.c @@ -48,6 +48,10 @@ #include <pjlib.h> +#ifdef _MSC_VER +#pragma warning(disable:4702) // warning C4702: unreachable code +#endif + #define ID_1 1 #define ID_2 2 diff --git a/pjmedia/src/pjmedia-codec/g7221.c b/pjmedia/src/pjmedia-codec/g7221.c index 2b9f1db7..281d89ab 100644 --- a/pjmedia/src/pjmedia-codec/g7221.c +++ b/pjmedia/src/pjmedia-codec/g7221.c @@ -679,7 +679,7 @@ static pj_status_t codec_open( pjmedia_codec *codec, } if (fmtp_bitrate == 0) - fmtp_bitrate = attr->info.avg_bps; + fmtp_bitrate = (pj_uint16_t)attr->info.avg_bps; /* Validate bitrate */ if (!fmtp_bitrate || !validate_mode(attr->info.clock_rate, fmtp_bitrate)) |