Merge commit 'f7986239f4dbec91c743c4c5eb0a2339bd325bf6'
[ffmpeg.git] / libavformat / srtpproto.c
2014-12-18 Michael NiedermayerMerge commit 'f2c614e8c4a935b52bbf86819128d9e797230c20'
2014-12-18 Tristan Matthewssrtpproto: fix option flag type
2013-04-09 Michael NiedermayerMerge remote-tracking branch 'qatar/master'
2013-04-09 Andrew Van Tillavf: Use RTP_MAX_PACKET_LENGTH instead of 1500
2013-01-15 Michael NiedermayerMerge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05'
2013-01-15 Martin Storsjölavf: Add a protocol for SRTP encryption/decryption