diff options
| author | Michael Niedermayer | 2013-04-09 11:36:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2013-04-09 11:36:39 +0200 |
| commit | 4e0130faed10fe9bd28e5d149b099c9b55612145 (patch) | |
| tree | 3be6765b9a595b72ca4cceffeab4f807bc0c427c /libavformat/srtp.c | |
| parent | 93e8fcb94b1ae3e1cb9be1164bb098b3ed188a11 (diff) | |
| parent | fc792308c5ae03d245e8bb7d3bf7fca08d6528e3 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTH
rtpdec: Increase max rtp packet size to 8192
lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500
h264pred: Add a few missing const declarations for ff_cropTbl derived pointers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/srtp.c')
| -rw-r--r-- | libavformat/srtp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/srtp.c b/libavformat/srtp.c index 65309d0763..b6e821115c 100644 --- a/libavformat/srtp.c +++ b/libavformat/srtp.c @@ -25,6 +25,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "rtp.h" +#include "rtpdec.h" #include "srtp.h" void ff_srtp_free(struct SRTPContext *s) @@ -419,7 +420,7 @@ static void test_encrypt(const uint8_t *data, int in_len, const char *suite, { struct SRTPContext enc = { 0 }, dec = { 0 }; int len; - char buf[1500]; + char buf[RTP_MAX_PACKET_LENGTH]; ff_srtp_set_crypto(&enc, suite, key); ff_srtp_set_crypto(&dec, suite, key); len = ff_srtp_encrypt(&enc, data, in_len, buf, sizeof(buf)); @@ -441,7 +442,7 @@ int main(void) static const char *aes128_32_suite = "AES_CM_128_HMAC_SHA1_32"; static const char *aes128_80_32_suite = "SRTP_AES128_CM_HMAC_SHA1_32"; static const char *test_key = "abcdefghijklmnopqrstuvwxyz1234567890ABCD"; - uint8_t buf[1500]; + uint8_t buf[RTP_MAX_PACKET_LENGTH]; struct SRTPContext srtp = { 0 }; int len; ff_srtp_set_crypto(&srtp, aes128_80_suite, aes128_80_key); |