automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37317 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/rtp.c b/rtp.c
index b794ee6f0e0a94edcdc72bab58ba7c67a7254981..a7d62d40508dd15ff3b48321dd13fe12a3a13d81 100644 (file)
--- a/rtp.c
+++ b/rtp.c
@@ -501,8 +501,8 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
        ssrc = ntohl(rtpheader[2]);
        
        if (!mark && rtp->rxssrc && rtp->rxssrc != ssrc) {
-               if (option_verbose > 1)
-                       ast_verbose(VERBOSE_PREFIX_2 "Forcing Marker bit, because SSRC has changed\n");
+               if (option_debug || rtpdebug)
+                       ast_log(LOG_DEBUG, "Forcing Marker bit, because SSRC has changed\n");
                mark = 1;
        }