| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c' | Michael Niedermayer | 2013-10-14 | 1 | -18/+30 |
|\ |
|
| * | rtmp: Allocate the prev_pkt arrays dynamically | Martin Storsjö | 2013-10-14 | 1 | -18/+30 |
* | | Merge commit 'cd818b3a5709b9b08bd5901cb8863a8b61be265e' | Michael Niedermayer | 2013-10-04 | 1 | -0/+2 |
|\| |
|
| * | rtmpproto: Validate the embedded flv packet size before copying | Martin Storsjö | 2013-10-04 | 1 | -0/+2 |
* | | Merge commit '8921e32f730c191543b84e61338bc9d549aa05a3' | Michael Niedermayer | 2013-10-04 | 1 | -0/+5 |
|\| |
|
| * | rtmpproto: Readjust the end of the flv buffer if handle_metadata exited early | Martin Storsjö | 2013-10-04 | 1 | -0/+5 |
* | | Merge commit '24fee95321c1463360ba7042d026dae021854360' | Michael Niedermayer | 2013-10-04 | 1 | -4/+3 |
|\| |
|
| * | rtmpproto: Move the flv header/trailer addition to append_flv_data | Martin Storsjö | 2013-10-04 | 1 | -4/+3 |
* | | Merge commit '72540e514ceaaed8ecb97ed63637b2a2a4447ab8' | Michael Niedermayer | 2013-10-04 | 1 | -2/+6 |
|\| |
|
| * | rtmpproto: Clear the flv allocation size on reallocp failures | Martin Storsjö | 2013-10-04 | 1 | -2/+6 |
* | | Merge commit '4d6d70292e91a7ef027824d731b6b6570ceabf2f' | Michael Niedermayer | 2013-10-04 | 1 | -1/+1 |
|\| |
|
| * | rtmpproto: Pass the 'live' parameter in the right unit | Martin Storsjö | 2013-10-04 | 1 | -1/+1 |
* | | Merge commit 'a6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb' | Michael Niedermayer | 2013-10-04 | 1 | -2/+6 |
|\| |
|
| * | rtmpproto: Print the error code string if there's no description | Martin Storsjö | 2013-10-04 | 1 | -2/+6 |
* | | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2013-10-02 | 1 | -0/+1 |
|\| |
|
| * | rtmp: alias rtmp_listen to listen | Luca Barbato | 2013-10-01 | 1 | -0/+1 |
* | | Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9' | Michael Niedermayer | 2013-09-27 | 1 | -1/+4 |
|\| |
|
| * | lavf: Reset the entry count and allocation size variables on av_reallocp fail... | Martin Storsjö | 2013-09-26 | 1 | -1/+4 |
* | | Merge commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6' | Michael Niedermayer | 2013-09-23 | 1 | -7/+8 |
|\| |
|
| * | rtmp: Replace a magic number with a macro | Luca Barbato | 2013-09-22 | 1 | -7/+8 |
* | | Merge commit '5840473890440dbe0bd2cce530ebb3d93e187ae6' | Michael Niedermayer | 2013-09-23 | 1 | -28/+42 |
|\| |
|
| * | rtmp: Rewrite embedded flv handling | Luca Barbato | 2013-09-22 | 1 | -28/+42 |
* | | Merge commit 'e40a0e822801d2485e4e555909d7a82713fa86a5' | Michael Niedermayer | 2013-09-23 | 1 | -62/+51 |
|\| |
|
| * | rtmp: Refactor get_packet | Luca Barbato | 2013-09-22 | 1 | -62/+51 |
* | | Merge commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91' | Michael Niedermayer | 2013-09-20 | 1 | -8/+9 |
|\| |
|
| * | rtmp: Unbreak get_packet | Luca Barbato | 2013-09-20 | 1 | -8/+9 |
* | | Merge commit 'b97b1adb3f807e1acd00d56319ee6cb41cc727e4' | Michael Niedermayer | 2013-09-20 | 1 | -0/+2 |
|\| |
|
| * | rtmpproto: Add a comment explaining the logic in handle_notify | Martin Storsjö | 2013-09-20 | 1 | -0/+2 |
| * | rtmp: Unbreak handle_notify | Luca Barbato | 2013-09-19 | 1 | -13/+14 |
* | | rtmp: Unbreak handle_notify | Luca Barbato | 2013-09-19 | 1 | -13/+14 |
* | | Merge commit '5626f994f273af80fb100d4743b963304de9e05c' | Michael Niedermayer | 2013-09-19 | 1 | -33/+33 |
|\| |
|
| * | avformat: Use av_reallocp() where suitable | Alexandra Khirnova | 2013-09-18 | 1 | -33/+33 |
* | | Merge commit '8583b14252deac71136f1dec231910abab0ba503' | Michael Niedermayer | 2013-09-18 | 1 | -1/+4 |
|\| |
|
| * | rtmp: Support reading interleaved chunks. | Josh Allmann | 2013-09-17 | 1 | -1/+4 |
* | | Merge commit 'dc4acc820076b2149ef6c921bdabe05d07ca1bc6' | Michael Niedermayer | 2013-09-18 | 1 | -1/+1 |
|\| |
|
| * | rtmpproto: Extend a comment to explain the prev_pkt arrays roles | Martin Storsjö | 2013-09-17 | 1 | -1/+1 |
* | | Merge commit '647d655d19c38e9716328e4787199149097d6089' | Michael Niedermayer | 2013-09-18 | 1 | -1/+1 |
|\| |
|
| * | rtmpproto: Consistently use the right prev_pkt array | Martin Storsjö | 2013-09-17 | 1 | -1/+1 |
* | | Merge commit '0d3784396b736374a61fea26268febdabd803a59' | Michael Niedermayer | 2013-09-18 | 1 | -1/+1 |
|\| |
|
| * | rtmpproto: Check for the right return code | Martin Storsjö | 2013-09-17 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2013-09-17 | 1 | -8/+8 |
|\| |
|
| * | rtmp: rename main_channel_id to stream_id. | Josh Allmann | 2013-09-17 | 1 | -8/+8 |
* | | Merge commit 'd4aef997809167832ecc64e89dda8cb445e5fe10' | Michael Niedermayer | 2013-09-17 | 1 | -2/+2 |
|\| |
|
| * | rtmp: Follow Flash player numbering for channels. | Josh Allmann | 2013-09-17 | 1 | -2/+2 |
* | | Merge commit '120af23cd5fcfc539d9575d17d403247ab17109b' | Michael Niedermayer | 2013-09-17 | 1 | -2/+6 |
|\| |
|
| * | rtmp: Send video on a separate channel. | Josh Allmann | 2013-09-17 | 1 | -2/+6 |
* | | Merge commit '92ed83e393d25b6d15920e90d56ee77de54a9728' | Michael Niedermayer | 2013-09-17 | 1 | -30/+29 |
|\| |
|
| * | rtmp: Store all the notify messages | Luca Barbato | 2013-09-16 | 1 | -30/+29 |
* | | Merge commit 'fe0337e89bbbe84b7274fbb0d9d56ed992937931' | Michael Niedermayer | 2013-09-17 | 1 | -1/+1 |
|\| |
|
| * | rtmp: Do not send the first field twice within the handshake | Luca Barbato | 2013-09-16 | 1 | -1/+1 |