[asterisk-commits] dlee: trunk r378783 - in /trunk: ./ main/rtp_engine.c

[SVN commits to the Asterisk project]

Author: dlee
Date: Wed Jan  9 14:30:33 2013
New Revision: 378783

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=378783
Log:
Fix end condition in ast_rtp_lookup_mime_multiple2.

The erroneous end condition would never include the AST_RTP_CISCO_DTMF flag
in the debug output.

(closes issue ASTERISK-20772)
Reported by: Xavier Hienne
........

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

Merged revisions 378780 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/main/rtp_engine.c

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

Modified: trunk/main/rtp_engine.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/rtp_engine.c?view=diff&rev=378783&r1=378782&r2=378783
==============================================================================
--- trunk/main/rtp_engine.c (original)
+++ trunk/main/rtp_engine.c Wed Jan  9 14:30:33 2013
@@ -849,7 +849,7 @@
 	} else {
 		int x;
 		ast_str_append(&buf, 0, "0x%x (", (unsigned int) rtp_capability);
-		for (x = 1; x < AST_RTP_MAX; x <<= 1) {
+		for (x = 1; x <= AST_RTP_MAX; x <<= 1) {
 			if (rtp_capability & x) {
 				name = ast_rtp_lookup_mime_subtype2(asterisk_format, NULL, x, options);
 				ast_str_append(&buf, 0, "%s|", name);