virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

rtsp: Make make_setup_request a nonstatic function

Browse Source 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit fef5649a820b30432578e1440776e7a71bd523cc)
This commit is contained in:
Martin Storsjo 2011-01-24 09:49:01 +00:00 committed by Michael Niedermayer
parent 1a172ce6b1
commit d89a08d81b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtsp.c
View File

@ -1017,7 +1017,7 @@ retry:
/** /**
* @return 0 on success, <0 on error, 1 if protocol is unavailable. * @return 0 on success, <0 on error, 1 if protocol is unavailable.
*/ */
static int make_setup_request(AVFormatContext *s, const char *host, int port, int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port,
int lower_transport, const char *real_challenge) int lower_transport, const char *real_challenge)
{ {
RTSPState *rt = s->priv_data; RTSPState *rt = s->priv_data;
@ -1493,7 +1493,7 @@ redirect:
int lower_transport = ff_log2_tab[lower_transport_mask & int lower_transport = ff_log2_tab[lower_transport_mask &
~(lower_transport_mask - 1)]; ~(lower_transport_mask - 1)];
err = make_setup_request(s, host, port, lower_transport, err = ff_rtsp_make_setup_request(s, host, port, lower_transport,
rt->server_type == RTSP_SERVER_REAL ? rt->server_type == RTSP_SERVER_REAL ?
real_challenge : NULL); real_challenge : NULL);
if (err < 0) if (err < 0)

7
libavformat/rtsp.h
View File

@ -504,4 +504,11 @@ int ff_rtsp_tcp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
*/ */
int ff_rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt); int ff_rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt);
/**
* Do the SETUP requests for each stream for the chosen
* lower transport mode.
*/
int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port,
int lower_transport, const char *real_challenge);
#endif /* AVFORMAT_RTSP_H */ #endif /* AVFORMAT_RTSP_H */