diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 15:58:14 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 15:58:14 +0400 |
commit | 81ff0c24ef050c1877639ecc3ba6c485fde0a74e (patch) | |
tree | 862e934366547cb8723d94f7f30953cb20d549b8 /libavformat/rtp.h | |
parent | 93f244e3abc3d75a797535a8da890bb1f9932433 (diff) | |
parent | 1cd432e167b1a80853760c89a33606e2b5f229c2 (diff) |
Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'
* commit '1cd432e167b1a80853760c89a33606e2b5f229c2':
configure: fix libcdio check
rtsp: Allow setting the reordering buffer size via an AVOption
rtsp: Vertically align a constant definition
rtp: Update the check for distinguishing between RTP and RTCP
aac: fix build with hardcoded tables
fate: dependencies for screen codec tests
riff: Move functions around to be covered by appropriate #ifdefs
Conflicts:
configure
tests/fate/screen.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtp.h')
-rw-r--r-- | libavformat/rtp.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/libavformat/rtp.h b/libavformat/rtp.h index fa3e1fa1bd..ab2de528a0 100644 --- a/libavformat/rtp.h +++ b/libavformat/rtp.h @@ -84,13 +84,24 @@ enum AVCodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type); /* RTCP packet types */ enum RTCPType { + RTCP_FIR = 192, + RTCP_NACK, // 193 + RTCP_SMPTETC,// 194 + RTCP_IJ, // 195 RTCP_SR = 200, RTCP_RR, // 201 RTCP_SDES, // 202 RTCP_BYE, // 203 - RTCP_APP // 204 + RTCP_APP, // 204 + RTCP_RTPFB,// 205 + RTCP_PSFB, // 206 + RTCP_XR, // 207 + RTCP_AVB, // 208 + RTCP_RSI, // 209 + RTCP_TOKEN,// 210 }; -#define RTP_PT_IS_RTCP(x) ((x) >= RTCP_SR && (x) <= RTCP_APP) +#define RTP_PT_IS_RTCP(x) (((x) >= RTCP_FIR && (x) <= RTCP_IJ) || \ + ((x) >= RTCP_SR && (x) <= RTCP_TOKEN)) #endif /* AVFORMAT_RTP_H */ |