[asterisk-commits] mmichelson: trunk r351311 - in /trunk: ./ res/res_rtp_asterisk.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Jan 17 11:23:25 2012
New Revision: 351311

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=351311
Log:
Eliminate odd initialization of probation variable.
........

Merged revisions 351306 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 351308 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/res/res_rtp_asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_rtp_asterisk.c?view=diff&rev=351311&r1=351310&r2=351311
==============================================================================
--- trunk/res/res_rtp_asterisk.c (original)
+++ trunk/res/res_rtp_asterisk.c Tue Jan 17 11:23:25 2012
@@ -495,11 +495,9 @@
  */
 static int rtp_learning_rtp_seq_update(struct ast_rtp *rtp, uint16_t seq)
 {
-	int probation = 0;
+	int probation = 1;
 
 	ast_debug(1, "%p -- probation = %d, seq = %d\n", rtp, rtp->learning_probation, seq);
-
-	probation = 1;
 
 	if (seq == rtp->learning_max_seq + 1) {
 		/* packet is in sequence */