From: Luigi Rizzo <rizzo@icir.org>
Date: Wed, 25 Jul 2007 09:45:15 +0000 (+0000)
Subject: Merged revisions 77022 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1925
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f4d728fe053e73c9a1bdeef1bf8353d6b41cf2d;p=thirdparty%2Fasterisk.git

Merged revisions 77022 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r77022 | rizzo | 2007-07-25 11:34:01 +0200 (Wed, 25 Jul 2007) | 3 lines

set the sequence number in a frame for all frame types


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/rtp.c b/main/rtp.c
index 8aa86a6137..7774f43eaf 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -1580,6 +1580,7 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
 	rtp->f.datalen = res - hdrlen;
 	rtp->f.data = rtp->rawdata + hdrlen + AST_FRIENDLY_OFFSET;
 	rtp->f.offset = hdrlen + AST_FRIENDLY_OFFSET;
+	rtp->f.seqno = seqno;
 	if (rtp->f.subclass < AST_FORMAT_MAX_AUDIO) {
 		rtp->f.samples = ast_codec_get_samples(&rtp->f);
 		if (rtp->f.subclass == AST_FORMAT_SLINEAR) 
@@ -1589,7 +1590,6 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp)
 		rtp->f.has_timing_info = 1;
 		rtp->f.ts = timestamp / 8;
 		rtp->f.len = rtp->f.samples / 8;
-		rtp->f.seqno = seqno;
 	} else if(rtp->f.subclass < AST_FORMAT_MAX_VIDEO) {
 		/* Video -- samples is # of samples vs. 90000 */
 		if (!rtp->lastividtimestamp)