automerge commit

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 891b51554ca2f64e4678fed66efa2c5e7578b794..a8db48d7f7dc097700e9c75071b620293f5181cb 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -96,7 +96,6 @@ static const char *descrip =
 "      's' -- Present menu (user or admin) when '*' is received ('send' to menu)\n"
 "      't' -- set talk only mode. (Talk only, no listening)\n"
 "      'T' -- set talker detection (sent to manager interface and meetme list)\n"
-"      'v' -- video mode\n"
 "      'w' -- wait until the marked user enters the conference\n"
 "      'x' -- close the conference when last marked user exits\n"
 "      'X' -- allow user to exit the conference by entering a valid single\n"
@@ -212,7 +211,7 @@ static void *recordthread(void *args);
 #define CONFFLAG_STARMENU (1 << 4)             /* If set asterisk will provide a menu to the user when '*' is pressed */
 #define CONFFLAG_TALKER (1 << 5)               /* If set the use can only send audio to the conference */
 #define CONFFLAG_QUIET (1 << 6)                        /* If set there will be no enter or leave sounds */
-#define CONFFLAG_VIDEO (1 << 7)                        /* Set to enable video mode */
+#define CONFFLAG_ANNOUNCEUSERCOUNT (1 << 7)    /* If set, when user joins the conference, they will be told the number of users that are already in */
 #define CONFFLAG_AGI (1 << 8)                  /* Set to run AGI Script in Background */
 #define CONFFLAG_MOH (1 << 9)                  /* Set to have music on hold when user is alone in conference */
 #define CONFFLAG_MARKEDEXIT (1 << 10)          /* If set the MeetMe will return if all marked with this flag left */
@@ -227,7 +226,6 @@ static void *recordthread(void *args);
 #define CONFFLAG_EMPTY (1 << 19)
 #define CONFFLAG_EMPTYNOPIN (1 << 20)
 #define CONFFLAG_ALWAYSPROMPT (1 << 21)
-#define CONFFLAG_ANNOUNCEUSERCOUNT (1 << 22)   /* If set, when user joins the conference, they will be told the number of users that are already in */
 
 
 AST_APP_OPTIONS(meetme_opts, {