[svn-commits] dlee: branch 11 r378780 - in /branches/11: ./ main/rtp_engine.c

[SVN commits to the Digium repositories]

Author: dlee
Date: Wed Jan  9 14:29:32 2013
New Revision: 378780

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=378780
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

Modified:
    branches/11/   (props changed)
    branches/11/main/rtp_engine.c

Propchange: branches/11/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Wed Jan  9 14:29:32 2013
@@ -1,1 +1,1 @@
-/branches/1.8:1-378147,378164,378356,378375,378427,378455-378456,378486,378514,378554,378591,378733
+/branches/1.8:1-378147,378164,378356,378375,378427,378455-378456,378486,378514,378554,378591,378733,378776

Modified: branches/11/main/rtp_engine.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/rtp_engine.c?view=diff&rev=378780&r1=378779&r2=378780
==============================================================================
--- branches/11/main/rtp_engine.c (original)
+++ branches/11/main/rtp_engine.c Wed Jan  9 14:29:32 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);