FS-9312 #resolve [unreachable code block in switch_core_media]

diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index ff71e3668e895584a6241e9ba336a3ec6a6a70f9..437f0dd4b9dd231ecd9d2c9bd3f977f7242ebfdc 100644 (file)
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -1827,6 +1827,8 @@ SWITCH_DECLARE(void) switch_core_media_prepare_codecs(switch_core_session_t *ses
                return;
        }
 
+       ocodec = switch_channel_get_variable(session->channel, SWITCH_ORIGINATOR_CODEC_VARIABLE);
+
        smh->payload_space = 0;
 
        switch_assert(smh->session != NULL);
@@ -1837,11 +1839,10 @@ SWITCH_DECLARE(void) switch_core_media_prepare_codecs(switch_core_session_t *ses
        }
 
        val = switch_channel_get_variable_dup(session->channel, "media_mix_inbound_outbound_codecs", SWITCH_FALSE, -1);
-       if (!val || !switch_true(val)) {
-               if ((ocodec = switch_channel_get_variable(session->channel, SWITCH_ORIGINATOR_CODEC_VARIABLE))) {
-                       codec_string = ocodec;
-                       goto ready;
-               }
+
+       if ((!val || !switch_true(val) || smh->media_flags[SCMF_DISABLE_TRANSCODING]) && ocodec) {
+               codec_string = ocodec;
+               goto ready;
        }
        
        if (!(codec_string = switch_channel_get_variable(session->channel, "codec_string"))) {
@@ -1854,13 +1855,7 @@ SWITCH_DECLARE(void) switch_core_media_prepare_codecs(switch_core_session_t *ses
        }
 
        if (ocodec) {
-               if (!codec_string || (smh->media_flags[SCMF_DISABLE_TRANSCODING])) {
-                       codec_string = ocodec;
-               } else {
-                       if (!(codec_string = switch_core_session_sprintf(smh->session, "%s,%s", ocodec, codec_string))) {
-                               codec_string = ocodec;
-                       }
-               }
+               codec_string = switch_core_session_sprintf(smh->session, "%s,%s", ocodec, codec_string);
        }
 
  ready: