[svn-commits] file: trunk r195096 - in /trunk: ./ main/rtp_engine.c

[SVN commits to the Digium repositories]

Author: file
Date: Mon May 18 08:56:16 2009
New Revision: 195096

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=195096
Log:
Merged revisions 195095 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r195095 | file | 2009-05-18 10:53:39 -0300 (Mon, 18 May 2009) | 5 lines
  
  Fix a bug where the codecs of the called party leg were not properly sent back to the caller call leg when reinvited.
  
  (closes issue #13569)
  Reported by: bkw918
........

Modified:
    trunk/   (props changed)
    trunk/main/rtp_engine.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/rtp_engine.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/rtp_engine.c?view=diff&rev=195096&r1=195095&r2=195096
==============================================================================
--- trunk/main/rtp_engine.c (original)
+++ trunk/main/rtp_engine.c Mon May 18 08:56:16 2009
@@ -1013,7 +1013,8 @@
 		}
 		if ((inaddrcmp(&t0, &ac0)) ||
 		    (vinstance0 && inaddrcmp(&vt0, &vac0)) ||
-		    (tinstance0 && inaddrcmp(&tt0, &tac0))) {
+		    (tinstance0 && inaddrcmp(&tt0, &tac0)) ||
+		    (codec0 != oldcodec0)) {
 			ast_debug(1, "Oooh, '%s' changed end address to %s:%d (format %d)\n",
 				  c0->name, ast_inet_ntoa(t0.sin_addr), ntohs(t0.sin_port), codec0);
 			ast_debug(1, "Oooh, '%s' was %s:%d/(format %d)\n",