[asterisk-commits] kpfleming: branch kpfleming/iax2_cleanup r264950 - in /team/kpfleming/iax2_cl...

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Fri May 21 08:47:04 2010
New Revision: 264950

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=264950
Log:
setup for automerge, and remove a definition that is not useful (IAX2
video frames are transported in meta frames, but don't have a meta command
identifier, they have a dedicated bit to indicate their type)


Modified:
    team/kpfleming/iax2_cleanup/   (props changed)
    team/kpfleming/iax2_cleanup/channels/iax2.h

Propchange: team/kpfleming/iax2_cleanup/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/kpfleming/iax2_cleanup/
------------------------------------------------------------------------------
    automerge-email = kpfleming at digium.com

Propchange: team/kpfleming/iax2_cleanup/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-264766

Modified: team/kpfleming/iax2_cleanup/channels/iax2.h
URL: http://svnview.digium.com/svn/asterisk/team/kpfleming/iax2_cleanup/channels/iax2.h?view=diff&rev=264950&r1=264949&r2=264950
==============================================================================
--- team/kpfleming/iax2_cleanup/channels/iax2.h (original)
+++ team/kpfleming/iax2_cleanup/channels/iax2.h Fri May 21 08:47:04 2010
@@ -170,7 +170,6 @@
 #define IAX_ENCRYPT_KEYROTATE			(1 << 15)       /*!< Keyrotation support */
 
 #define IAX_META_TRUNK				1		/*!< Trunk meta-message */
-#define IAX_META_VIDEO				2		/*!< Video frame */
 
 #define IAX_META_TRUNK_SUPERMINI		0	/*!< This trunk frame contains classic supermini frames */
 #define IAX_META_TRUNK_MINI			1	/*!< This trunk frame contains trunked mini frames */