Changeset 5170 for pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.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/pjmedia/src/pjmedia/sdp_neg.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

@@ -1177 +1177 @@
                             /* Match! */
                             if (is_codec) {
-                                pjmedia_sdp_media *o, *a;
+                                pjmedia_sdp_media *o_med, *a_med;
                                 unsigned o_fmt_idx, a_fmt_idx;
 
-                                o = (pjmedia_sdp_media*)offer;
-                                a = (pjmedia_sdp_media*)preanswer;
+                                o_med = (pjmedia_sdp_media*)offer;
+                                a_med = (pjmedia_sdp_media*)preanswer;
                                 o_fmt_idx = prefer_remote_codec_order? i:j;
                                 a_fmt_idx = prefer_remote_codec_order? j:i;
@@ -1187 +1187 @@
                                 /* Call custom format matching callbacks */
                                 if (custom_fmt_match(pool, &or_.enc_name,
-                                                     o, o_fmt_idx,
-                                                     a, a_fmt_idx,
+                                                     o_med, o_fmt_idx,
+                                                     a_med, a_fmt_idx,
                                                      ALLOW_MODIFY_ANSWER) !=
                                     PJ_SUCCESS)