Changeset 1929 for pjproject/trunk/pjmedia/src/pjmedia/conference.c

Timestamp:

Apr 14, 2008 4:04:30 AM (16 years ago)

Author:

bennylp

Message:

Fixed miscellaneous compile warnings/errors when built with C++ mode

File:

• pjproject/trunk/pjmedia/src/pjmedia/conference.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/conference.c

@@ -1374 +1374 @@
             if (cport->channel_count != conf->channel_count) {
                 if (cport->channel_count == 1) {
-                    pjmedia_convert_channel_1ton(f.buf, f.buf,
+                    pjmedia_convert_channel_1ton((pj_int16_t*)f.buf, 
+                                                 (const pj_int16_t*)f.buf,
                                                  conf->channel_count, 
                                                  cport->samples_per_frame,
@@ -1381 +1382 @@
                                             conf->channel_count);
                 } else { /* conf->channel_count == 1 */
-                    pjmedia_convert_channel_nto1(f.buf, f.buf,
+                    pjmedia_convert_channel_nto1((pj_int16_t*)f.buf, 
+                                                 (const pj_int16_t*)f.buf,
                                                  cport->channel_count, 
                                                  cport->samples_per_frame,