[asterisk-commits] oej: branch oej/videocaps r171440 - in /team/oej/videocaps: ./ channels/

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Jan 26 12:54:36 2009
New Revision: 171440

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=171440
Log:
Moving stuff around n trunk causes things to happen in other branches ...

Modified:
    team/oej/videocaps/   (props changed)
    team/oej/videocaps/channels/chan_sip.c

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
    automerge = http://www.codename-pineapple.org/

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 26 12:54:36 2009
@@ -1,1 +1,1 @@
-/trunk:1-171345
+/trunk:1-171399

Modified: team/oej/videocaps/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/team/oej/videocaps/channels/chan_sip.c?view=diff&rev=171440&r1=171439&r2=171440
==============================================================================
--- team/oej/videocaps/channels/chan_sip.c (original)
+++ team/oej/videocaps/channels/chan_sip.c Mon Jan 26 12:54:36 2009
@@ -529,8 +529,6 @@
 #define DEFAULT_QUALIFY_GAP   100
 #define DEFAULT_QUALIFY_PEERS 1
 
-static int global_qualify_gap = DEFAULT_QUALIFY_GAP;              /*!< Time between our group of peer pokes */
-static int global_qualify_peers = DEFAULT_QUALIFY_PEERS;          /*!< Number of peers to poke at a given time */
 
 #define CALLERID_UNKNOWN        "Unknown"
 
@@ -1118,6 +1116,8 @@
 	If a fmtp comes in then we overwrite with new values.
 	*/
 static struct ast_capabilities global_caps; 
+static int global_qualify_gap;              /*!< Time between our group of peer pokes */
+static int global_qualify_peers;          /*!< Number of peers to poke at a given time */
 
 
 /*! \brief Codecs that we support by default: */