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 82091a040ce6c2a32ae9920b8d4f301bd443ad0c..ea5e9035331e93a907e20282080c74ca05251992 100644 (file)
--- 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 */