From: Matthew Nicholson <mnicholson@digium.com>
Date: Tue, 10 Nov 2009 15:41:46 +0000 (+0000)
Subject: Reverted revision 202006.
X-Git-Tag: 1.6.0.18-rc3~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4eadd117e61fe7630f89752aa6ecc4c063048e9c;p=thirdparty%2Fasterisk.git

Reverted revision 202006.

(closes issue #16175)
Reported by: paul-tg


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@229100 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 3e67752beb..82039cd6c3 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -5270,20 +5270,8 @@ static void try_suggested_sip_codec(struct sip_pvt *p)
 	int fmt;
 	const char *codec;
 
-	while (p->owner && ast_channel_trylock(p->owner)) {
-		sip_pvt_unlock(p);
-		sched_yield();
-		sip_pvt_lock(p);
-	}
-
-	if (!p->owner)
-		return;
-
-	codec = ast_strdupa(S_OR(pbx_builtin_getvar_helper(p->owner, "SIP_CODEC"), ""));
-
-	ast_channel_unlock(p->owner);
-
-	if (ast_strlen_zero(codec))
+	codec = pbx_builtin_getvar_helper(p->owner, "SIP_CODEC");
+	if (!codec) 
 		return;
 
 	fmt = ast_getformatbyname(codec);