From 0a8f3e5f162a541fa257c38f44b6c6dac1c20294 Mon Sep 17 00:00:00 2001 From: mnicholson Date: Tue, 10 Nov 2009 15:41:46 +0000 Subject: Reverted revision 202006. (closes issue #16175) Reported by: paul-tg git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@229100 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_sip.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'channels/chan_sip.c') diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 3e67752be..82039cd6c 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); -- cgit v1.2.3