From 95d880fa6436f3b557a9c060428a04b9e4d552df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 9 Dec 2014 16:05:14 +0200 Subject: [PATCH] rtpproto: Fix the input RTP data format check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only the upper 2 bits of the first byte are known to be a fixed value. The lower bits in the first byte of a RTP packet could be set if the input is from another RTP packetizers than libavformat's, but for RTCP packets, they would also be set when sending RTCP RR packets, triggering false warnings about incorrect input format to the protocol. Signed-off-by: Martin Storsjö --- libavformat/rtpproto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index 1171fc2f14..5bff00ed7a 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -411,7 +411,7 @@ static int rtp_write(URLContext *h, const uint8_t *buf, int size) if (size < 2) return AVERROR(EINVAL); - if (buf[0] != (RTP_VERSION << 6)) + if ((buf[0] & 0xc0) != (RTP_VERSION << 6)) av_log(h, AV_LOG_WARNING, "Data doesn't look like RTP packets, " "make sure the RTP muxer is used\n");