automerge commit

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 1b9b12952aed461367a0286ca11863302e009286..9c22ea20d9a20f9b865c9d5d748158671506fba4 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1547,7 +1547,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
                                        if (user->listen.actual)
                                                ast_frame_adjust_volume(&fr, user->listen.actual);
                                        if (ast_write(chan, &fr) < 0) {
-                                               ast_log(LOG_WARNING, "Unable to write frame to channel: %s\n", strerror(errno));
+                                               ast_log(LOG_WARNING, "Unable to write frame to channel %s\n", chan->name);
                                        }
                                } else 
                                        ast_log(LOG_WARNING, "Failed to read frame: %s\n", strerror(errno));