summaryrefslogtreecommitdiffstats
path: root/libavformat/srtpproto.c
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'Derek Buitenhuis2016-04-211-1/+1
|\
| * avio: Copy URLContext generic options into child URLContextsMartin Storsjö2016-03-241-1/+1
| * urlprotocol: receive a list of protocols from the callerAnton Khirnov2016-02-221-1/+2
* | avformat: Add a protocol blacklisting APIDerek Buitenhuis2016-03-041-1/+1
* | Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'Derek Buitenhuis2016-02-291-1/+1
|\ \ | |/
| * lavf: reorganize URLProtocolsAnton Khirnov2016-02-221-1/+1
* | Update demuxers and protocols for protocol whitelist supportMichael Niedermayer2016-02-021-1/+2
* | Merge commit 'f2c614e8c4a935b52bbf86819128d9e797230c20'Michael Niedermayer2014-12-181-2/+2
|\ \ | |/
| * srtpproto: fix option flag typeTristan Matthews2014-12-181-2/+2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-091-1/+2
|\ \ | |/
| * lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500Andrew Van Til2013-04-091-1/+2
* | Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05'Michael Niedermayer2013-01-151-4/+4
|/
* lavf: Add a protocol for SRTP encryption/decryptionMartin Storsjö2013-01-151-0/+144
OpenPOWER on IntegriCloud