[asterisk-commits] dvossel: branch dvossel/shortbus r325739 - /team/dvossel/shortbus/configs/

[SVN commits to the Asterisk project]

Author: dvossel
Date: Wed Jun 29 15:58:57 2011
New Revision: 325739

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=325739
Log:
confbridge.conf documentation update

Modified:
    team/dvossel/shortbus/configs/confbridge.conf.sample

Modified: team/dvossel/shortbus/configs/confbridge.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/shortbus/configs/confbridge.conf.sample?view=diff&rev=325739&r1=325738&r2=325739
==============================================================================
--- team/dvossel/shortbus/configs/confbridge.conf.sample (original)
+++ team/dvossel/shortbus/configs/confbridge.conf.sample Wed Jun 29 15:58:57 2011
@@ -169,20 +169,22 @@
                         ; or 80.  By default 20ms is used.
 
 ;video_mode = first_marked ; Sets how confbridge handles video distribution to the conference participants.
-                          ; --- MODES ---
-                          ; none: No video sources are set by default in the conference. It is still
-                          ;       possible for a user to be set as a video source via AMI or DTMF action
-                          ;       at any time.
-                          ;
-                          ; last_marked: The last marked user to join the conference with video capabilities
-                          ;              will be the single source of video distributed to all participants.
-                          ;              If multiple marked users are capable of video, the last one to join
-                          ;              is always the source, when that user leaves it goes to the one who
-                          ;              joined before them.
-                          ;
-                          ; first_marked: The first marked user to join the conference with video capabilities
-                          ;               is the single source of video distribution among all participants. If
-                          ;               that user leaves, the marked user to join after them becomes the source.
+                           ; Note that participants wanting to view and be the source of a video feed
+                           ; _MUST_ be sharing the same video codec.
+                           ; --- MODES ---
+                           ; none: No video sources are set by default in the conference. It is still
+                           ;       possible for a user to be set as a video source via AMI or DTMF action
+                           ;       at any time.
+                           ;
+                           ; last_marked: The last marked user to join the conference with video capabilities
+                           ;              will be the single source of video distributed to all participants.
+                           ;              If multiple marked users are capable of video, the last one to join
+                           ;              is always the source, when that user leaves it goes to the one who
+                           ;              joined before them.
+                           ;
+                           ; first_marked: The first marked user to join the conference with video capabilities
+                           ;               is the single source of video distribution among all participants. If
+                           ;               that user leaves, the marked user to join after them becomes the source.
 
 ; All sounds in the conference are customizable using the bridge profile options below.
 ; Simply state the option followed by the filename or full path of the filename after