Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / rtspenc.c

diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c
index b54ae28eb86f19673fb34bf2c64a0ea86b647eee..f3c846a5fbe1cb0e3e260d00f9a5379827cb8980 100644 (file)
--- a/libavformat/rtspenc.c
+++ b/libavformat/rtspenc.c
@@ -159,7 +159,7 @@ static int tcp_write_packet(AVFormatContext *s, RTSPStream *rtsp_st)
         size -= 4;
         if (packet_len > size || packet_len < 2)
             break;
-        if (ptr[1] >= RTCP_SR && ptr[1] <= RTCP_APP)
+        if (RTP_PT_IS_RTCP(ptr[1]))
             id = rtsp_st->interleaved_max; /* RTCP */
         else
             id = rtsp_st->interleaved_min; /* RTP */
@@ -245,4 +245,3 @@ AVOutputFormat ff_rtsp_muxer = {
     .flags = AVFMT_NOFILE | AVFMT_GLOBALHEADER,
     .priv_class = &rtsp_muxer_class,
 };
-