diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 19:40:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 19:40:20 +0100 |
| commit | 1295377f0a9de3140330d4467347f10d03ec4169 (patch) | |
| tree | 8b5b652ae983e4b56fa685a828d81b7707fa5d7e /libavformat/rtsp.h | |
| parent | 04894ef32e325e33d420e15c16e3714e0f95fdb0 (diff) | |
| parent | 50aef03b24d949249b020226dffa3a78077f1056 (diff) | |
| download | ffmpeg-1295377f0a9de3140330d4467347f10d03ec4169.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtspenc: Make sure BYE packets are sent before TEARDOWN
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.h')
| -rw-r--r-- | libavformat/rtsp.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 2dc4b6cbae..76c7f181cf 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -598,6 +598,11 @@ int ff_rtsp_tcp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, uint8_t *buf, int buf_size); /** + * Send buffered packets over TCP. + */ +int ff_rtsp_tcp_write_packet(AVFormatContext *s, RTSPStream *rtsp_st); + +/** * Receive one packet from the RTSPStreams set up in the AVFormatContext * (which should contain a RTSPState struct as priv_data). */ @@ -615,7 +620,7 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, * Undo the effect of ff_rtsp_make_setup_request, close the * transport_priv and rtp_handle fields. */ -void ff_rtsp_undo_setup(AVFormatContext *s); +void ff_rtsp_undo_setup(AVFormatContext *s, int send_packets); /** * Open RTSP transport context. |