summaryrefslogtreecommitdiff
path: root/libavformat/rtmpcrypt.c
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-051-1/+1
|\
| * avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö2012-09-041-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-241-0/+2
|\ \ | |/
| * rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE codeMartin Storsjö2012-07-241-0/+2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-231-4/+4
|/
* RTMPTE protocol supportSamuel Pitoiset2012-07-231-4/+29
* RTMPE protocol supportSamuel Pitoiset2012-07-231-0/+309