[asterisk-commits] branch oej/test-this-branch r33028 - in /team/oej/test-this-branch: ./ format...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Thu Jun  8 05:11:56 2006
New Revision: 33028

URL: http://svn.digium.com/view/asterisk?rev=33028&view=rev
Log:
Oops

Modified:
    team/oej/test-this-branch/   (props changed)
    team/oej/test-this-branch/formats/format_h263.c
    team/oej/test-this-branch/formats/format_h264.c
    team/oej/test-this-branch/include/asterisk/doxyref.h
    team/oej/test-this-branch/rtp.c

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun  8 05:11:56 2006
@@ -1,1 +1,1 @@
-/trunk:1-32988
+/trunk:1-33009

Modified: team/oej/test-this-branch/formats/format_h263.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/formats/format_h263.c?rev=33028&r1=33027&r2=33028&view=diff
==============================================================================
--- team/oej/test-this-branch/formats/format_h263.c (original)
+++ team/oej/test-this-branch/formats/format_h263.c Thu Jun  8 05:11:56 2006
@@ -21,6 +21,7 @@
  * \brief Save to raw, headerless h263 data.
  * \arg File name extension: h263
  * \ingroup formats
+ * \arg See \ref AstVideo
  */
  
 #include "asterisk.h"

Modified: team/oej/test-this-branch/formats/format_h264.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/formats/format_h264.c?rev=33028&r1=33027&r2=33028&view=diff
==============================================================================
--- team/oej/test-this-branch/formats/format_h264.c (original)
+++ team/oej/test-this-branch/formats/format_h264.c Thu Jun  8 05:11:56 2006
@@ -21,6 +21,7 @@
  * \brief Save to raw, headerless h264 data.
  * \arg File name extension: h264
  * \ingroup formats
+ * \arg See \ref AstVideo
  */
  
 #include "asterisk.h"
@@ -47,6 +48,8 @@
 /* Some Ideas for this code came from makeh264e.c by Jeffrey Chilton */
 
 /* Portions of the conversion code are by guido at sienanet.it */
+/*! \todo Check this buf size estimate, it may be totally wrong for large frame video */
+
 #define BUF_SIZE	4096	/* Two Real h264 Frames */
 struct h264_desc {
 	unsigned int lastts;

Modified: team/oej/test-this-branch/include/asterisk/doxyref.h
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/include/asterisk/doxyref.h?rev=33028&r1=33027&r2=33028&view=diff
==============================================================================
--- team/oej/test-this-branch/include/asterisk/doxyref.h (original)
+++ team/oej/test-this-branch/include/asterisk/doxyref.h Thu Jun  8 05:11:56 2006
@@ -36,6 +36,7 @@
  *  \arg \ref AstCDR
  *  \arg \ref AstREADME
  *  \arg \ref AstVar
+ *  \arg \ref AstVideo
  *  \arg \ref AstENUM : The IETF way to redirect from phone numbers to VoIP calls
  *  \arg \ref AstHTTP
  *  \arg \ref AstSpeech
@@ -129,9 +130,14 @@
  *  \verbinclude CREDITS
  */
 
+/*! \page AstVideo Video support in Asterisk
+ * \section sectAstVideo Video support in Asterisk
+ *  \verbinclude video.txt
+ */
+
 /*! \page AstVar Global channel variables
  * \section globchan Global Channel Variables
- *  \verbinclude variables.txt
+ *  \verbinclude channelvariables.txt
  */
 
 /*! \page AstENUM ENUM
@@ -164,6 +170,7 @@
  * \arg \link Config_mm Meetme (conference bridge) configuration  \endlink
  * \arg \link Config_qu Queue system configuration  \endlink
  * \arg \link Config_vm Voicemail configuration  \endlink
+ * \arg \link Config_followme Followme configuration  \endlink
  * \section cdrconf CDR configuration files
  * \arg \link Config_cdr CDR configuration  \endlink
  * \arg \link cdr_custom Custom CDR driver configuration \endlink
@@ -202,6 +209,12 @@
  * \verbinclude features.conf.sample
  */
 
+/*! \page Config_followme followme.conf 
+ * \section followmeconf Followme.conf
+ * - See app_followme.c
+ * \verbinclude followme.conf.sample
+ */
+
 /*! \page Config_ext Extensions.conf - the Dial Plan
  * \section dialplan Extensions.conf 
  * \verbinclude extensions.conf.sample

Modified: team/oej/test-this-branch/rtp.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/rtp.c?rev=33028&r1=33027&r2=33028&view=diff
==============================================================================
--- team/oej/test-this-branch/rtp.c (original)
+++ team/oej/test-this-branch/rtp.c Thu Jun  8 05:11:56 2006
@@ -1777,7 +1777,6 @@
 		rtp->rtcp->schedid = -1;
 	}
 
->>>>>>> .merge-right.r32971
 	if (rtp->smoother)
 		ast_smoother_free(rtp->smoother);
 	if (rtp->ioid)