From: Automerge script <automerge@asterisk.org>
Date: Thu, 13 Jul 2006 19:02:05 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.10-netsec~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25ba50fb8f127db5fb3f82768f452ec851bf7315;p=thirdparty%2Fasterisk.git

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 a7d62d4050..7de9727e98 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);