[asterisk-commits] oej: branch oej/videocaps r48972 - in /team/oej/videocaps: ./ include/asterisk/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Dec 27 08:49:17 2006
New Revision: 48972

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48972
Log:
Update

Modified:
    team/oej/videocaps/   (props changed)
    team/oej/videocaps/include/asterisk/frame.h

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 27 08:49:17 2006
@@ -1,1 +1,1 @@
-/trunk:1-48256
+/trunk:1-48258

Modified: team/oej/videocaps/include/asterisk/frame.h
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/include/asterisk/frame.h?view=diff&rev=48972&r1=48971&r2=48972
==============================================================================
--- team/oej/videocaps/include/asterisk/frame.h (original)
+++ team/oej/videocaps/include/asterisk/frame.h Wed Dec 27 08:49:17 2006
@@ -52,7 +52,7 @@
 	\arg \b VIDEO:	Video data, subclass is codec (AST_FORMAT_*)
 	\arg \b DTMF:	A DTMF digit, subclass is the digit
 	\arg \b IMAGE:	Image transport, mostly used in IAX
-	\arg \b TEXT:	Text messages
+	\arg \b TEXT:	Text messages and character by character (real time text)
 	\arg \b HTML:	URL's and web pages
 	\arg \b MODEM:	Modulated data encodings, such as T.38 and V.150
 	\arg \b IAX:	Private frame type for the IAX protocol
@@ -261,9 +261,8 @@
 /*! Maximum video format */
 #define AST_FORMAT_MAX_VIDEO	(1 << 24)
 #define AST_FORMAT_VIDEO_MASK   (((1 << 25)-1) & ~(AST_FORMAT_AUDIO_MASK))
-/*! T.140 Text */
-#define AST_FORMAT_T140   (1 << 25)
-/*! Maximum video format */
+/*! T.140 Text format - ITU T.140, RFC 4351*/
+#define AST_FORMAT_T140		(1 << 25)
 #define AST_FORMAT_MAX_TEXT	(1 << 26)
 #define AST_FORMAT_TEXT_MASK   (((1 << 27)-1) & ~(AST_FORMAT_AUDIO_MASK) & ~(AST_FORMAT_VIDEO_MASK))