Commit Graph

4 Commits

Author SHA1 Message Date
Michael Niedermayer
4e0130faed 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>
2013-04-09 11:36:39 +02:00
Andrew Van Til
350ad50bf4 lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-09 10:36:43 +03:00
Michael Niedermayer
b52925d2cd 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>
2013-01-15 16:05:34 +01:00
Martin Storsjö
2f3bada63e lavf: Add a protocol for SRTP encryption/decryption
This is mostly useful for encryption together with the RTP muxer,
but could also be set up as IO towards the peer with the SDP
demuxer with custom IO.

Signed-off-by: Martin Storsjö <martin@martin.st>
2013-01-15 11:55:10 +02:00