[svn-commits] seanbright: branch 1.6.0 r135198 - in /branches/1.6.0: ./ channels/chan_mgcp.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Fri Aug  1 14:30:31 2008
New Revision: 135198

URL: http://svn.digium.com/view/asterisk?view=rev&rev=135198
Log:
Merged revisions 135197 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r135197 | seanbright | 2008-08-01 15:29:26 -0400 (Fri, 01 Aug 2008) | 6 lines

Remove some code that used to do something but does not anymore, mainly
to get rid of a shadow warning (but this seemed legitimate enough to fix
here instead of in my branch).

Thanks to putnopvut for taking a look as well.

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_mgcp.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_mgcp.c?view=diff&rev=135198&r1=135197&r2=135198
==============================================================================
--- branches/1.6.0/channels/chan_mgcp.c (original)
+++ branches/1.6.0/channels/chan_mgcp.c Fri Aug  1 14:30:31 2008
@@ -2165,12 +2165,8 @@
 	char local[256];
 	char tmp[80];
 	int x;
-	int capability;
 	struct mgcp_endpoint *p = sub->parent;
 
-	capability = p->capability;
-	if (codecs)
-		capability = codecs;
 	if (ast_strlen_zero(sub->cxident) && rtp) {
 		/* We don't have a CXident yet, store the destination and
 		   wait a bit */