aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtmpproto.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * lavf: use designated initializers for all protocolsAnton Khirnov2011-04-081-6/+5
| | | | | | | | | | This is more readable and makes it easier to reorder URLProtocol members.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-081-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proto: include os_support.h in network.h matroskaenc: don't write an empty Cues element. lavc: add a FF_API_REQUEST_CHANNELS deprecation macro avio: move extern url_interrupt_cb declaration from avio.h to url.h avio: make av_register_protocol2 internal. avio: avio_ prefix for url_set_interrupt_cb. avio: AVIO_ prefixes for URL_ open flags. proto: introduce listen option in tcp doc: clarify configure features proto: factor ff_network_wait_fd and use it on udp Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: AVIO_ prefixes for URL_ open flags.Anton Khirnov2011-04-071-2/+2
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-051-8/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) ac3enc: move extract_exponents inner loop to ac3dsp avio: deprecate url_get_filename(). avio: deprecate url_max_packet_size(). avio: make url_get_file_handle() internal. avio: make url_filesize() internal. avio: make url_close() internal. avio: make url_seek() internal. avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together avio: make url_write() internal. avio: make url_read_complete() internal. avio: make url_read() internal. avio: make url_open() internal. avio: make url_connect internal. avio: make url_alloc internal. applehttp: Merge two for loops applehttp: Restructure the demuxer to use a custom AVIOContext applehttp: Move finished and target_duration to the variant struct aacenc: reduce the number of loop index variables avio: deprecate url_open_protocol avio: deprecate url_poll and URLPollEntry ... Conflicts: libavformat/applehttp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: deprecate url_max_packet_size().Anton Khirnov2011-04-041-1/+1
| | | | | | | | URLContext.max_packet_size should be used directly.
| * avio: make url_close() internal.Anton Khirnov2011-04-041-1/+1
| |
| * avio: make url_write() internal.Anton Khirnov2011-04-041-3/+3
| |
| * avio: make url_read_complete() internal.Anton Khirnov2011-04-041-2/+2
| |
| * avio: make url_open() internal.Anton Khirnov2011-04-041-1/+2
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * rtmpproto: rename URLContext* argument in rtmp_write()Anton Khirnov2011-02-031-2/+2
| | | | | | | | | | | | | | | | | | Now the first argument is URLContext *h. However, the function logs to LOG_CONTEXT, which is #defined as 's' for new lavf major versions. Therefore, rename h -> s. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-261-1/+1
| | | | | | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
* | rtmpproto: rename URLContext* argument in rtmp_write()Anton Khirnov2011-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | Now the first argument is URLContext *h. However, the function logs to LOG_CONTEXT, which is #defined as 's' for new lavf major versions. Therefore, rename h -> s. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 9ad4c65f6fa7ff6d3fb7d5ea02908bbd6adc583f)
* | Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-281-1/+1
|/ | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts. (cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca)
* properly check for FF_API_URL_CLASS instead of LIBAVFORMAT_VERSION_MAJORAurelien Jacobs2010-10-151-3/+3
| | | | Originally committed as revision 25484 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix grammar errors in documentationMåns Rullgård2010-06-301-17/+17
| | | | Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ff_url_split() publicMåns Rullgård2010-06-271-1/+1
| | | | | | | ff_url_split() is retained as an alias, as it was used by ffserver, to avoid breaking ABI compatibility with it. Originally committed as revision 23822 to svn://svn.ffmpeg.org/ffmpeg/trunk
* RTMP: Return from rtmp_read as soon as some data is availableMartin Storsjö2010-06-181-0/+1
| | | | | | | | Earlier, the function only returned when the enough data to fill the requested buffer was available. This lead to high latency when receiving low-bandwidth streams. Originally committed as revision 23642 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Declare the url_write buffer parameter as constMartin Storsjö2010-06-011-1/+1
| | | | Originally committed as revision 23401 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 24l trocadero: RTMP reader forgot to shift high byte of timestamp to itstrueice@gmail.com2010-05-251-1/+1
| | | | | | | | proper position Patch by trueice (his gmail account is obvious) Originally committed as revision 23305 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move ff_url_split() and ff_url_join() declarations to internal.hAurelien Jacobs2010-03-141-0/+1
| | | | | | those functions are not part of the public API Originally committed as revision 22534 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ReindentMartin Storsjö2010-03-081-1/+1
| | | | Originally committed as revision 22322 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename url_split to ff_url_splitMartin Storsjö2010-03-081-1/+1
| | | | | | Since this function isn't in the public API, it should have an ff_ prefix. Originally committed as revision 22321 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use ff_url_join for assembling URLs, instead of snprintfMartin Storsjö2010-03-051-2/+2
| | | | | | | | | This ensures proper escaping of numerical IPv6 addresses. The RTSP (de)muxer needs its own network initialization, since it isn't a protocol and url_open hasn't been called yet. Originally committed as revision 22226 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make RTMP client send bytes read reportKostya Shishkov2010-02-181-0/+38
| | | | Originally committed as revision 21882 to svn://svn.ffmpeg.org/ffmpeg/trunk
* another 10l: forgot to change parent condition as wellKostya Shishkov2010-01-301-1/+1
| | | | Originally committed as revision 21535 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l trocadero: now return value of ff_rtmp_packet_read() has different meaningKostya Shishkov2010-01-301-1/+1
| | | | Originally committed as revision 21534 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correct timestamps inside FLV data received by RTMP.Sergiy2010-01-121-2/+22
| | | | | | Patch by Sergiy (gmail(piratfm)) Originally committed as revision 21161 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use old-style RTMP handshake for old servers.Art Clarke2010-01-121-1/+1
| | | | | | | This fixes issue streaming from Red5 server. Patch by Art Clarke (aclarke@`echo xyzzy|sed s/y/u/|sed s/y/le/|tr z g`.com) Originally committed as revision 21160 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reply to RTMP ping with the same value as received by client.Martin Storsjö2009-12-161-1/+1
| | | | | | Patch by Martin Storsjö ($name at $name dot \163\164) Originally committed as revision 20881 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Dump RTMP packet contents in debug modeKostya Shishkov2009-12-111-0/+6
| | | | Originally committed as revision 20799 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 5l trocadero: don't forget to free packet in gen_connect()Martin Storsjö2009-12-111-0/+1
| | | | | | Patch by Martin Storsjö ($name at $name dot `abbreviation for "street"`) Originally committed as revision 20798 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not try to interact with RTMP server after "stop" command was received.Martin Storsjö2009-12-111-0/+10
| | | | | | Patch by Martin Storsjö ($name at $name dot `Sao Tome and Principe domain`) Originally committed as revision 20797 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: insert space between codeword and left parenthesisKostya Shishkov2009-12-061-3/+3
| | | | Originally committed as revision 20746 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not send invokes to RTMP server if we are not connected to it.Sergiy2009-12-061-2/+4
| | | | | | Patch by Sergiy (server.connect("gmail.com").selectAddress("piratfm")) Originally committed as revision 20745 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: reindent after last commitKostya Shishkov2009-12-041-78/+78
| | | | Originally committed as revision 20732 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement RTMP output (publishing FLV stream to RTMP server).Sergiy2009-12-041-13/+241
| | | | | | Patch by Sergiy (piratfm at `do-no-evil-mail`.com) Originally committed as revision 20731 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove duplicating variableKostya Shishkov2009-12-031-1/+0
| | | | Originally committed as revision 20718 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Send connect() and createStream() in RTMP system channel, not video channel.Sergiy2009-12-031-2/+2
| | | | | | Patch by Sergiy (com gmail . piratfm @ mail =) Originally committed as revision 20716 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move "app" string into RTMP protocol context.Sergiy2009-12-031-10/+11
| | | | | | Patch by Sergiy (com.gmail@piratfm) Originally committed as revision 20715 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move is_input flag into RTMP protocol context.Sergiy2009-12-021-4/+4
| | | | | | | Patch by Sergiy (gmail(piratfm)) Thread "[PATCH] rtmp-output" Originally committed as revision 20702 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Full-header RTMP packets contain real timestamp, others contain timestampKostya Shishkov2009-12-011-9/+0
| | | | | | | | difference, so make all read packets store absolute timestamp. As a consequence, we don't need to track audio/video timestamps separately any longer in protocol handler. Originally committed as revision 20685 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Print error when RTMP protocol can't open connectionKostya Shishkov2009-11-221-1/+3
| | | | Originally committed as revision 20574 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Pass only useful FLV metadata from RTMP streamKostya Shishkov2009-11-221-1/+1
| | | | Originally committed as revision 20573 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split overly long line in doxy.Stefano Sabatini2009-11-121-1/+4
| | | | Originally committed as revision 20529 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Last parameter in RTMP "play" call was optional and some servers seem not toKostya Shishkov2009-10-181-2/+1
| | | | | | understand it, so drop it. Originally committed as revision 20268 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not include "mp4:" prefix from RTMP URL into "app" path or second timeLars Täuber2009-09-171-3/+5
| | | | | | | | | into playpath. Patch by Lars Täuber (<$name> . <$lastname with umlaut replaced with diphtong> @ <gmx> . <net>) Originally committed as revision 19894 to svn://svn.ffmpeg.org/ffmpeg/trunk
* RTMP protocol support (as a client)Kostya Shishkov2009-07-311-0/+695
Originally committed as revision 19556 to svn://svn.ffmpeg.org/ffmpeg/trunk