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

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

diff --git a/main/rtp.c b/main/rtp.c
index dbf2eaf0bcafaf049da1616ed4a24e3a61ff9f64..4946addaa8a2698d327cab0a344cf7f19d37f69e 100644 (file)
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -3929,7 +3929,8 @@ static enum ast_bridge_result bridge_native_loop(struct ast_channel *c0, struct
                }
                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",