aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authortwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2011-04-14 21:53:01 +0000
committertwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2011-04-14 21:53:01 +0000
commita9368dbd84a3287450596d86da48f69b9e5cf5cc (patch)
tree41d1f12d0885ea2f372ed6545e451c6d291e3d35 /res
parent56314b8394711c7a5101db3ca499e67bf8af27ce (diff)
Sets video mark bit on format field correctly
This fixes a regression in the media architecture change where video frames did not have their video mark set correctly. dvossel wrote this. twilson kindly committed this, mmichelson found the bug. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@313822 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_rtp_asterisk.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index b2004efab..e68d09c18 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -2311,7 +2311,9 @@ static struct ast_frame *ast_rtp_read(struct ast_rtp_instance *instance, int rtc
rtp->f.delivery.tv_sec = 0;
rtp->f.delivery.tv_usec = 0;
/* Pass the RTP marker bit as bit */
- ast_format_set_video_mark(&rtp->f.subclass.format);
+ if (mark) {
+ ast_format_set_video_mark(&rtp->f.subclass.format);
+ }
} else {
/* TEXT -- samples is # of samples vs. 1000 */
if (!rtp->lastitexttimestamp)