[asterisk-commits] file: branch 1.6.1 r195098 - in /branches/1.6.1: ./ main/rtp.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon May 18 08:58:30 2009
New Revision: 195098

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

................
  r195096 | file | 2009-05-18 10:56:16 -0300 (Mon, 18 May 2009) | 12 lines
  
  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:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/rtp.c

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

Modified: branches/1.6.1/main/rtp.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/rtp.c?view=diff&rev=195098&r1=195097&r2=195098
==============================================================================
--- branches/1.6.1/main/rtp.c (original)
+++ branches/1.6.1/main/rtp.c Mon May 18 08:58:30 2009
@@ -3929,7 +3929,8 @@
 		}
 		if ((inaddrcmp(&t0, &ac0)) ||
 		    (vp0 && inaddrcmp(&vt0, &vac0)) ||
-		    (tp0 && inaddrcmp(&tt0, &tac0))) {
+		    (tp0 && inaddrcmp(&tt0, &tac0)) ||
+		    (codec0 != oldcodec0)) {
 			ast_debug(2, "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(2, "Oooh, '%s' was %s:%d/(format %d)\n",