FS-7513: move code up

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 2acfee326af406cf525c7230fa8b5646501e69e9..ffd8bd0f85ed71384f49a12ad625ec1a64a2ce33 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -3641,6 +3641,11 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
        switch_assert(conference != NULL);
        switch_assert(member != NULL);
 
+       if (member->session && switch_test_flag(conference, CFLAG_TRANSCODE_VIDEO)) {
+               switch_channel_set_flag(channel, CF_VIDEO_DECODED_READ);
+               switch_core_media_gen_key_frame(member->session);
+       }
+
        switch_mutex_lock(conference->mutex);
        switch_mutex_lock(member->audio_in_mutex);
        switch_mutex_lock(member->audio_out_mutex);
@@ -3689,13 +3694,6 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
                        switch_set_flag_locked(member, MFLAG_ACK_VIDEO);
                }
 
-               if (switch_test_flag(conference, CFLAG_TRANSCODE_VIDEO)) {
-                       switch_channel_set_flag(channel, CF_VIDEO_DECODED_READ);
-                       switch_core_media_gen_key_frame(member->session);
-               }
-
-
-
                if ((var = switch_channel_get_variable_dup(member->channel, "video_mute_png", SWITCH_FALSE, -1))) {
                        member->video_mute_png = switch_core_strdup(member->pool, var);
                }