eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-06 14:15:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-04-09 11:36:35 +02:00
parent 93e8fcb94b fc792308c5
commit 4e0130faed
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/srtp.c
View File

@@ -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);