summaryrefslogtreecommitdiff
path: root/libavformat/srtpproto.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-09 11:36:35 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-09 11:36:39 +0200
commit4e0130faed10fe9bd28e5d149b099c9b55612145 (patch)
tree3be6765b9a595b72ca4cceffeab4f807bc0c427c /libavformat/srtpproto.c
parent93e8fcb94b1ae3e1cb9be1164bb098b3ed188a11 (diff)
parentfc792308c5ae03d245e8bb7d3bf7fca08d6528e3 (diff)
downloadffmpeg-4e0130faed10fe9bd28e5d149b099c9b55612145.tar.gz
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/srtpproto.c')
-rw-r--r--libavformat/srtpproto.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/srtpproto.c b/libavformat/srtpproto.c
index f5e3d14090..f9d6b1733f 100644
--- a/libavformat/srtpproto.c
+++ b/libavformat/srtpproto.c
@@ -25,6 +25,7 @@
#include "url.h"
#include "internal.h"
+#include "rtpdec.h"
#include "srtp.h"
typedef struct SRTPProtoContext {
@@ -33,7 +34,7 @@ typedef struct SRTPProtoContext {
const char *out_suite, *out_params;
const char *in_suite, *in_params;
struct SRTPContext srtp_out, srtp_in;
- uint8_t encryptbuf[1500];
+ uint8_t encryptbuf[RTP_MAX_PACKET_LENGTH];
} SRTPProtoContext;
#define D AV_OPT_FLAG_DECODING_PARAM