From: Joshua Colp <jcolp@digium.com>
Date: Mon, 18 May 2009 13:56:16 +0000 (+0000)
Subject: Merged revisions 195095 via svnmerge from
X-Git-Tag: 11.0.0-beta1~4872
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1073e0ac3f429b1c71cf51f54e0723a423dd687;p=thirdparty%2Fasterisk.git

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
........


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

diff --git a/main/rtp_engine.c b/main/rtp_engine.c
index ac0885a10e..eeeefa90e2 100644
--- a/main/rtp_engine.c
+++ b/main/rtp_engine.c
@@ -1013,7 +1013,8 @@ static enum ast_bridge_result remote_bridge_loop(struct ast_channel *c0, struct
 		}
 		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",