summaryrefslogtreecommitdiff
path: root/libavformat/rtmpcrypt.c
Commit message (Expand)AuthorAge
* Merge commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4'Michael Niedermayer2015-05-29
|\
| * rtmpdh: Pass the actual buffer size of the output secret keyMartin Storsjö2015-05-29
* | Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-05
|\|
| * avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö2012-09-04
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-24
|\|
| * rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE codeMartin Storsjö2012-07-24
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-23
|/
* RTMPTE protocol supportSamuel Pitoiset2012-07-23
* RTMPE protocol supportSamuel Pitoiset2012-07-23