diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-15 00:09:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-15 00:14:21 +0200 |
| commit | 15f8941108c5372862035ce8e3cbfd2a6cefb241 (patch) | |
| tree | 921dc52f4b22ae8f66f251000ecf495154f41e88 /libavformat/rtmppkt.h | |
| parent | 01a14ce0424a45caa24d4a9103afe26c39a6fd35 (diff) | |
| parent | d246c18ea6dca4dbdc92aec6ae4e3e038999a709 (diff) | |
| download | ffmpeg-15f8941108c5372862035ce8e3cbfd2a6cefb241.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Avoid C99 variable declarations within for statements.
rtmp: Read and handle incoming packets while writing data
doc: document THREAD_TYPE fate variable
rtpdec: Don't require frames to start with a Mode A packet
avconv: don't try to free threads that were not initialized.
Conflicts:
doc/fate.texi
ffplay.c
libavdevice/dv1394.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmppkt.h')
| -rw-r--r-- | libavformat/rtmppkt.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libavformat/rtmppkt.h b/libavformat/rtmppkt.h index 8acbfc116b..7291397345 100644 --- a/libavformat/rtmppkt.h +++ b/libavformat/rtmppkt.h @@ -115,6 +115,19 @@ void ff_rtmp_packet_destroy(RTMPPacket *pkt); */ int ff_rtmp_packet_read(URLContext *h, RTMPPacket *p, int chunk_size, RTMPPacket *prev_pkt); +/** + * Read internal RTMP packet sent by the server. + * + * @param h reader context + * @param p packet + * @param chunk_size current chunk size + * @param prev_pkt previously read packet headers for all channels + * (may be needed for restoring incomplete packet header) + * @param c the first byte already read + * @return number of bytes read on success, negative value otherwise + */ +int ff_rtmp_packet_read_internal(URLContext *h, RTMPPacket *p, int chunk_size, + RTMPPacket *prev_pkt, uint8_t c); /** * Send RTMP packet to the server. |