summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2013-03-04 21:15:36 +0000
committerRichard Mudgett <rmudgett@digium.com>2013-03-04 21:15:36 +0000
commit736f4e942038c96c15ea595c67a43187e2f294d8 (patch)
tree4286a2698b997721c64dda1aa4ec76615be54c34 /main
parent22d58fbea8dfcac70eca517dcb29e4ae995e311a (diff)
Fixup some bridge and format capabilities comments and whitespace.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@382392 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/bridging.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/bridging.c b/main/bridging.c
index 20cfb7999..875e8503c 100644
--- a/main/bridging.c
+++ b/main/bridging.c
@@ -638,9 +638,10 @@ static int bridge_make_compatible(struct ast_bridge *bridge, struct ast_bridge_c
ast_format_copy(&formats[0], ast_channel_readformat(bridge_channel->chan));
ast_format_copy(&formats[1], ast_channel_writeformat(bridge_channel->chan));
- /* Are the formats currently in use something ths bridge can handle? */
+ /* Are the formats currently in use something this bridge can handle? */
if (!ast_format_cap_iscompatible(bridge->technology->format_capabilities, ast_channel_readformat(bridge_channel->chan))) {
struct ast_format best_format;
+
ast_best_codec(bridge->technology->format_capabilities, &best_format);
/* Read format is a no go... */
@@ -662,6 +663,7 @@ static int bridge_make_compatible(struct ast_bridge *bridge, struct ast_bridge_c
if (!ast_format_cap_iscompatible(bridge->technology->format_capabilities, &formats[1])) {
struct ast_format best_format;
+
ast_best_codec(bridge->technology->format_capabilities, &best_format);
/* Write format is a no go... */