diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2015-08-25 08:45:46 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2015-08-25 08:45:46 +0000 |
| commit | 7ffa781dc39a7274692d8db11043b3a9e92e36ce (patch) | |
| tree | 77653933e1c211dbec6c125da9ec5c28f9eeaa4e /pjsip-apps/src/samples/mix.c | |
| parent | 1b41ed3f7c9361106a585c1fe43d2338ab94cacc (diff) | |
Re #1881: Fixed compile warnings on VS2015 about declaration hides previous declaration.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5170 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src/samples/mix.c')
| -rw-r--r-- | pjsip-apps/src/samples/mix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pjsip-apps/src/samples/mix.c b/pjsip-apps/src/samples/mix.c index cc139f76..da2dd6d8 100644 --- a/pjsip-apps/src/samples/mix.c +++ b/pjsip-apps/src/samples/mix.c @@ -195,14 +195,14 @@ int main(int argc, char *argv[]) processed = 0; while (processed < longest + clock_rate * APPEND * 2 / 1000) { pj_int16_t framebuf[PTIME * 48000 / 1000]; - pjmedia_port *cp = pjmedia_conf_get_master_port(conf); + pjmedia_port *mp = pjmedia_conf_get_master_port(conf); pjmedia_frame frame; frame.buf = framebuf; - frame.size = PJMEDIA_PIA_SPF(&cp->info) * 2; + frame.size = PJMEDIA_PIA_SPF(&mp->info) * 2; pj_assert(frame.size <= sizeof(framebuf)); - CHECK( pjmedia_port_get_frame(cp, &frame) ); + CHECK( pjmedia_port_get_frame(mp, &frame) ); if (frame.type != PJMEDIA_FRAME_TYPE_AUDIO) { pj_bzero(frame.buf, frame.size); |