diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 16:05:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 16:05:34 +0100 |
| commit | b52925d2cde98b2a3ffaf451248191c8627d356a (patch) | |
| tree | b5bc13efa1c4f0151fb47fecf295935000c71dc7 /libavformat/rtpdec.h | |
| parent | e7e0186eeb0a0aa1e2ca805b97eb60cbd14e0567 (diff) | |
| parent | 2f3bada63e57345329c4f9b48e9b81b5cfc03d05 (diff) | |
Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05'
* commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05':
lavf: Add a protocol for SRTP encryption/decryption
rtsp: Support decryption of SRTP signalled via RFC 4568 (SDES)
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec.h')
| -rw-r--r-- | libavformat/rtpdec.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index cf7448850f..0c5dcabc8b 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -27,6 +27,7 @@ #include "avformat.h" #include "rtp.h" #include "url.h" +#include "srtp.h" typedef struct PayloadContext PayloadContext; typedef struct RTPDynamicProtocolHandler RTPDynamicProtocolHandler; @@ -43,6 +44,8 @@ RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st, int payload_type, int queue_size); void ff_rtp_parse_set_dynamic_protocol(RTPDemuxContext *s, PayloadContext *ctx, RTPDynamicProtocolHandler *handler); +void ff_rtp_parse_set_crypto(RTPDemuxContext *s, const char *suite, + const char *params); int ff_rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, uint8_t **buf, int len); void ff_rtp_parse_close(RTPDemuxContext *s); @@ -163,6 +166,9 @@ struct RTPDemuxContext { /* used to send back RTCP RR */ char hostname[256]; + int srtp_enabled; + struct SRTPContext srtp; + /** Statistics for this stream (used by RTCP receiver reports) */ RTPStatistics statistics; |