Changeset 5827

Timestamp:

Jul 19, 2018 7:25:17 AM (6 years ago)

Author:

nanang

Message:

Re #2126: Added rtcp_fb.c to Makefile and fixed compile warnings on gcc.

Location:

pjproject/trunk/pjmedia

Files:

• build/Makefile (modified) (1 diff)
• src/pjmedia/rtcp_fb.c (modified) (3 diffs)

pjproject/trunk/pjmedia/build/Makefile

@@ -68 +68 @@
                         null_port.o plc_common.o port.o splitcomb.o \
                         resample_resample.o resample_libsamplerate.o resample_speex.o \
-                        resample_port.o rtcp.o rtcp_xr.o rtp.o \
+                        resample_port.o rtcp.o rtcp_xr.o rtcp_fb.o rtp.o \
                         sdp.o sdp_cmp.o sdp_neg.o session.o silencedet.o \
                         sound_legacy.o sound_port.o stereo_port.o stream_common.o \

pjproject/trunk/pjmedia/src/pjmedia/rtcp_fb.c

@@ -301 +301 @@
     if (cap->param.slen) {
         pj_ansi_snprintf(tmp, sizeof(tmp), "%s %.*s %.*s", pt,
-                         type_name.slen, type_name.ptr,
-                         cap->param.slen, cap->param.ptr);
+                         (int)type_name.slen, type_name.ptr,
+                         (int)cap->param.slen, cap->param.ptr);
     } else {
         pj_ansi_snprintf(tmp, sizeof(tmp), "%s %.*s", pt,
-                         type_name.slen, type_name.ptr);
+                         (int)type_name.slen, type_name.ptr);
     }
     pj_strset2(&val, tmp);
@@ -339 +339 @@
         pt = pj_strtoul(&m->desc.fmt[j]);
         if (pt < 96) {
-            pjmedia_codec_info *ci;
+            const pjmedia_codec_info *ci;
             status = pjmedia_codec_mgr_get_codec_info(codec_mgr,
                                                       pt, &ci);
@@ -359 +359 @@
                 pj_ansi_snprintf(sci[cnt].id, sizeof(sci[0].id),
                                  "%.*s/%d/%.*s",
-                                 r.enc_name.slen, r.enc_name.ptr,
+                                 (int)r.enc_name.slen, r.enc_name.ptr,
                                  r.clock_rate,
-                                 r.param.slen, r.param.ptr);
+                                 (int)r.param.slen, r.param.ptr);
             } else {
                 pj_ansi_snprintf(sci[cnt].id, sizeof(sci[0].id),
                                  "%.*s/%d/1",
-                                 r.enc_name.slen, r.enc_name.ptr,
+                                 (int)r.enc_name.slen, r.enc_name.ptr,
                                  r.clock_rate);
             }