Changeset 5170 for pjproject/trunk/pjsip-apps/src/samples/mix.c

Timestamp:

Aug 25, 2015 8:45:46 AM (9 years ago)

Author:

nanang

Message:

Re #1881: Fixed compile warnings on VS2015 about declaration hides previous declaration.

File:

• pjproject/trunk/pjsip-apps/src/samples/mix.c (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/samples/mix.c

@@ -196 +196 @@
     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) {