FS-7913 #resolve

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 8dfb587ca602d9ecd8349405ed67684871ec451a..5a3793e4af7b29b8a608e29afd150bc26eaa20b5 100644 (file)
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -385,7 +385,7 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
                double screen_aspect = 0, img_aspect = 0;
                int x_pos = layer->x_pos;
                int y_pos = layer->y_pos;
-               int64_t img_addr = 0;
+               switch_size_t img_addr = 0;
 
                img_w = layer->screen_w = IMG->d_w * layer->geometry.scale / VIDEO_LAYOUT_SCALE;
                img_h = layer->screen_h = IMG->d_h * layer->geometry.hscale / VIDEO_LAYOUT_SCALE;
@@ -394,7 +394,7 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
                screen_aspect = (double) layer->screen_w / layer->screen_h;
                img_aspect = (double) img->d_w / img->d_h;
 
-               img_addr = (int64_t)img;
+               img_addr = (switch_size_t)img;
 
                if (layer->last_img_addr != img_addr && layer->geometry.zoom) {
                        if (screen_aspect < img_aspect) {

diff --git a/src/mod/applications/mod_conference/mod_conference.h b/src/mod/applications/mod_conference/mod_conference.h
index 62c88dede3e04ecb5013a84a0d5a0ab2945628f0..b397232cfa9cee0569629252f40599635d35713a 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.h
+++ b/src/mod/applications/mod_conference/mod_conference.h
@@ -438,7 +438,7 @@ typedef struct mcu_layer_s {
        int avatar_patched;
        int refresh;
        int is_avatar;
-       int64_t last_img_addr;
+       switch_size_t last_img_addr;
        switch_img_position_t logo_pos;
        switch_image_t *img;
        switch_image_t *cur_img;