]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Clang-3.5 warnings fixed
authorBrian West <brian@freeswitch.org>
Sat, 11 Apr 2015 16:13:07 +0000 (11:13 -0500)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:47:20 +0000 (12:47 -0500)
src/switch_core_video.c
src/switch_vidderbuffer.c

index b2945ba26c65f634ba7e294396f2dff556bee54b..5a86c37d34ee205d6e5a1a25fa34fde9919884e1 100644 (file)
@@ -162,7 +162,7 @@ SWITCH_DECLARE(void) switch_img_copy(switch_image_t *img, switch_image_t **new_i
        switch_assert(img);
        switch_assert(new_img);
 
-       if (!img->fmt == SWITCH_IMG_FMT_I420) return;
+       if (!(img->fmt == SWITCH_IMG_FMT_I420)) return;
 
        if (*new_img != NULL) {
                if (img->d_w != (*new_img)->d_w || img->d_h != (*new_img)->d_w) {
@@ -196,7 +196,7 @@ SWITCH_DECLARE(switch_image_t *) switch_img_copy_rect(switch_image_t *img, int x
        switch_assert(img);
        switch_assert(x >= 0 && y >= 0 && w >= 0 && h >= 0);
 
-       if (!img->fmt == SWITCH_IMG_FMT_I420) return NULL;
+       if (!(img->fmt == SWITCH_IMG_FMT_I420)) return NULL;
 
        new_img = switch_img_alloc(NULL, SWITCH_IMG_FMT_I420, w, h, 1);
        if (new_img == NULL) return NULL;
index 415f4f7cfc08724dd370550c55e8bb2722738004..55517515a39792e381bd6d79cf105e476d8bbcef 100644 (file)
@@ -255,8 +255,8 @@ static inline void add_node(switch_vb_t *vb, switch_rtp_packet_t *packet, switch
 
 
 
-       if (vb->write_init && ((abs(htons(packet->header.seq) - htons(vb->highest_wrote_seq)) > 16) || 
-                                                  (abs(ntohl(node->packet.header.ts) - ntohl(vb->highest_wrote_ts)) > 900000))) {
+       if (vb->write_init && ((abs(((int)htons(packet->header.seq) - htons(vb->highest_wrote_seq))) > 16) || 
+                                                  (abs((int)((int64_t)ntohl(node->packet.header.ts) - (int64_t)ntohl(vb->highest_wrote_ts))) > 900000))) {
                vb_debug(vb, 2, "%s", "CHANGE DETECTED, PUNT\n");
                switch_vb_reset(vb);
        }