Revision
15675
Author
anthm
Date
2009-11-25 16:21:02 -0600 (Wed, 25 Nov 2009)

Log Message

too bad nobody reads all the rest of the code where more critical issues may lie

Modified Paths

Diff

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (15674 => 15675)


--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	2009-11-25 21:34:51 UTC (rev 15674)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	2009-11-25 22:21:02 UTC (rev 15675)
@@ -411,17 +411,17 @@
 
 const char *sofia_glue_get_codec_string(private_object_t *tech_pvt)
 {
-	const char *codec_string = NULL;
+	const char *codec_string = NULL, *preferred = NULL, *fallback = NULL;
 	
 	if (switch_channel_direction(tech_pvt->channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
-		if (!zstr(tech_pvt->profile->outbound_codec_string)) {
-			codec_string = tech_pvt->profile->outbound_codec_string ? tech_pvt->profile->outbound_codec_string : tech_pvt->profile->inbound_codec_string;
-		}
+		preferred = tech_pvt->profile->outbound_codec_string;
+		fallback = tech_pvt->profile->inbound_codec_string;
 	} else {
-		if (!zstr(tech_pvt->profile->inbound_codec_string)) {
-			codec_string = tech_pvt->profile->inbound_codec_string ? tech_pvt->profile->inbound_codec_string : tech_pvt->profile->outbound_codec_string;
-		}
+		preferred = tech_pvt->profile->inbound_codec_string;
+		fallback = tech_pvt->profile->outbound_codec_string;
 	}
+
+	codec_string = !zstr(preferred) ? preferred : fallback;
 	
 	return codec_string;
 }