summaryrefslogtreecommitdiffstats
path: root/libavformat/rtmpproto.c
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '24eb3c791606fe98a1591c13a8b2ba6c342bb3b5'Michael Niedermayer2014-01-211-2/+2
|\
| * rtmpproto: Avoid using uninitialized memoryMartin Storsjö2014-01-201-2/+2
| * rtmpproto: Reorder conditions to help dead code eliminationVittorio Giovara2013-11-031-6/+6
* | Merge commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c'Michael Niedermayer2013-10-141-18/+30
|\ \ | |/
| * rtmp: Allocate the prev_pkt arrays dynamicallyMartin Storsjö2013-10-141-18/+30
* | Merge commit 'cd818b3a5709b9b08bd5901cb8863a8b61be265e'Michael Niedermayer2013-10-041-0/+2
|\ \ | |/
| * rtmpproto: Validate the embedded flv packet size before copyingMartin Storsjö2013-10-041-0/+2
* | Merge commit '8921e32f730c191543b84e61338bc9d549aa05a3'Michael Niedermayer2013-10-041-0/+5
|\ \ | |/
| * rtmpproto: Readjust the end of the flv buffer if handle_metadata exited earlyMartin Storsjö2013-10-041-0/+5
* | Merge commit '24fee95321c1463360ba7042d026dae021854360'Michael Niedermayer2013-10-041-4/+3
|\ \ | |/
| * rtmpproto: Move the flv header/trailer addition to append_flv_dataMartin Storsjö2013-10-041-4/+3
* | Merge commit '72540e514ceaaed8ecb97ed63637b2a2a4447ab8'Michael Niedermayer2013-10-041-2/+6
|\ \ | |/
| * rtmpproto: Clear the flv allocation size on reallocp failuresMartin Storsjö2013-10-041-2/+6
* | Merge commit '4d6d70292e91a7ef027824d731b6b6570ceabf2f'Michael Niedermayer2013-10-041-1/+1
|\ \ | |/
| * rtmpproto: Pass the 'live' parameter in the right unitMartin Storsjö2013-10-041-1/+1
* | Merge commit 'a6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb'Michael Niedermayer2013-10-041-2/+6
|\ \ | |/
| * rtmpproto: Print the error code string if there's no descriptionMartin Storsjö2013-10-041-2/+6
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-021-0/+1
|\ \ | |/
| * rtmp: alias rtmp_listen to listenLuca Barbato2013-10-011-0/+1
* | Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'Michael Niedermayer2013-09-271-1/+4
|\ \ | |/
| * lavf: Reset the entry count and allocation size variables on av_reallocp fail...Martin Storsjö2013-09-261-1/+4
* | Merge commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6'Michael Niedermayer2013-09-231-7/+8
|\ \ | |/
| * rtmp: Replace a magic number with a macroLuca Barbato2013-09-221-7/+8
* | Merge commit '5840473890440dbe0bd2cce530ebb3d93e187ae6'Michael Niedermayer2013-09-231-28/+42
|\ \ | |/
| * rtmp: Rewrite embedded flv handlingLuca Barbato2013-09-221-28/+42
* | Merge commit 'e40a0e822801d2485e4e555909d7a82713fa86a5'Michael Niedermayer2013-09-231-62/+51
|\ \ | |/
| * rtmp: Refactor get_packetLuca Barbato2013-09-221-62/+51
* | Merge commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91'Michael Niedermayer2013-09-201-8/+9
|\ \ | |/
| * rtmp: Unbreak get_packetLuca Barbato2013-09-201-8/+9
* | Merge commit 'b97b1adb3f807e1acd00d56319ee6cb41cc727e4'Michael Niedermayer2013-09-201-0/+2
|\ \ | |/
| * rtmpproto: Add a comment explaining the logic in handle_notifyMartin Storsjö2013-09-201-0/+2
| * rtmp: Unbreak handle_notifyLuca Barbato2013-09-191-13/+14
* | rtmp: Unbreak handle_notifyLuca Barbato2013-09-191-13/+14
* | Merge commit '5626f994f273af80fb100d4743b963304de9e05c'Michael Niedermayer2013-09-191-33/+33
|\ \ | |/
| * avformat: Use av_reallocp() where suitableAlexandra Khirnova2013-09-181-33/+33
* | Merge commit '8583b14252deac71136f1dec231910abab0ba503'Michael Niedermayer2013-09-181-1/+4
|\ \ | |/
| * rtmp: Support reading interleaved chunks.Josh Allmann2013-09-171-1/+4
* | Merge commit 'dc4acc820076b2149ef6c921bdabe05d07ca1bc6'Michael Niedermayer2013-09-181-1/+1
|\ \ | |/
| * rtmpproto: Extend a comment to explain the prev_pkt arrays rolesMartin Storsjö2013-09-171-1/+1
* | Merge commit '647d655d19c38e9716328e4787199149097d6089'Michael Niedermayer2013-09-181-1/+1
|\ \ | |/
| * rtmpproto: Consistently use the right prev_pkt arrayMartin Storsjö2013-09-171-1/+1
* | Merge commit '0d3784396b736374a61fea26268febdabd803a59'Michael Niedermayer2013-09-181-1/+1
|\ \ | |/
| * rtmpproto: Check for the right return codeMartin Storsjö2013-09-171-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-171-8/+8
|\ \ | |/
| * rtmp: rename main_channel_id to stream_id.Josh Allmann2013-09-171-8/+8
* | Merge commit 'd4aef997809167832ecc64e89dda8cb445e5fe10'Michael Niedermayer2013-09-171-2/+2
|\ \ | |/
| * rtmp: Follow Flash player numbering for channels.Josh Allmann2013-09-171-2/+2
* | Merge commit '120af23cd5fcfc539d9575d17d403247ab17109b'Michael Niedermayer2013-09-171-2/+6
|\ \ | |/
| * rtmp: Send video on a separate channel.Josh Allmann2013-09-171-2/+6
* | Merge commit '92ed83e393d25b6d15920e90d56ee77de54a9728'Michael Niedermayer2013-09-171-30/+29
|\ \ | |/
OpenPOWER on IntegriCloud