automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@37560 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 2 insertions, 1 deletions

diff --git a/rtp.c b/rtp.c
index a7d62d405..7de9727e9 100644
--- 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);