automerge commit

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

diff --git a/rtp.c b/rtp.c
index a7d62d40508dd15ff3b48321dd13fe12a3a13d81..7de9727e9803ad3462c3e3f269aeeb4a22d781d1 100644 (file)
--- a/rtp.c
+++ b/rtp.c
@@ -444,7 +444,8 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
        unsigned int ssrc;
        unsigned int timestamp;
        unsigned int *rtpheader;
-       static struct ast_frame *f, null_frame = { AST_FRAME_NULL, };
+       struct ast_frame *f;
+       static struct ast_frame null_frame = { AST_FRAME_NULL, };
        struct rtpPayloadType rtpPT;
        
        len = sizeof(sin);