From: Automerge script <automerge@asterisk.org>
Date: Fri, 29 Jun 2012 21:19:04 +0000 (+0000)
Subject: Merged revisions 369511 via svnmerge from
X-Git-Tag: 10.7.0-digiumphones-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fb96676bde59b14ab48e4e4fc8d4ae82c0de89a;p=thirdparty%2Fasterisk.git

Merged revisions 369511 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

........
  r369511 | mmichelson | 2012-06-29 15:28:10 -0500 (Fri, 29 Jun 2012) | 3 lines

  Fix apparent copy and paste error where incorrect "glue" is used.
........


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

diff --git a/main/rtp_engine.c b/main/rtp_engine.c
index 82091a040c..ea5e903533 100644
--- a/main/rtp_engine.c
+++ b/main/rtp_engine.c
@@ -1201,7 +1201,7 @@ static enum ast_bridge_result remote_bridge_loop(struct ast_channel *c0,
 				if (glue1->get_codec && c1->tech_pvt) {
 					ast_format_cap_remove_all(cap1);
 					ast_format_cap_remove_all(oldcap1);
-					glue0->get_codec(c1, cap1);
+					glue1->get_codec(c1, cap1);
 					ast_format_cap_append(oldcap1, cap1);
 				}
 				/* Since UPDATE_BRIDGE_PEER is only used by the bridging code, don't forward it */