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

[SVN commits to the Asterisk project]

Author: oej
Date: Fri May 30 06:28:55 2008
New Revision: 119208

URL: http://svn.digium.com/view/asterisk?view=rev&rev=119208
Log:
Fixing preference of T140red before T140

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

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 30 06:28:55 2008
@@ -1,1 +1,1 @@
-/trunk:1-119185
+/trunk:1-119207

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=119208&r1=119207&r2=119208
==============================================================================
--- team/oej/videocaps/include/asterisk/frame.h (original)
+++ team/oej/videocaps/include/asterisk/frame.h Fri May 30 06:28:55 2008
@@ -274,10 +274,10 @@
 /*! MPEG4 Video */
 #define AST_FORMAT_MP4_VIDEO	(1 << 22)
 #define AST_FORMAT_VIDEO_MASK   (((1 << 25)-1) & ~(AST_FORMAT_AUDIO_MASK))
+/*! T.140 Text format with RTP redundant packets - ITU T.140, RFC 4351, RFC 4103*/
+#define AST_FORMAT_T140RED      (1 << 26)
 /*! T.140 Text format - ITU T.140, RFC 4103 */
-#define AST_FORMAT_T140		(1 << 26)
-/*! T.140 Text format with RTP redundant packets - ITU T.140, RFC 4351, RFC 4103*/
-#define AST_FORMAT_T140RED      (1 << 27)
+#define AST_FORMAT_T140		(1 << 27)
 /*! Maximum text mask */
 #define AST_FORMAT_MAX_TEXT	(1 << 28))
 #define AST_FORMAT_TEXT_MASK   (((1 << 30)-1) & ~(AST_FORMAT_AUDIO_MASK) & ~(AST_FORMAT_VIDEO_MASK))