summaryrefslogtreecommitdiff
path: root/libavformat/rtmphttp.c
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-18
|\
| * RTMPTS protocol supportSamuel Pitoiset2012-07-17
| * rtmp: Rename rtmphttp to ffrtmphttpSamuel Pitoiset2012-07-17
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-22
|\|
| * Replace usleep() calls with av_usleep()Mans Rullgard2012-06-22
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-20
|\|
| * rtmp: Reduce the number of idle posts sent by sleeping 50msSamuel Pitoiset2012-06-19
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-18
|/
* RTMPT protocol supportSamuel Pitoiset2012-06-17