diff options
| author | Jordi Ortiz <nenjordi@gmail.com> | 2012-07-10 19:25:04 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-07-10 21:21:19 +0300 |
| commit | 6e71c1202bbdca0a95680e07507b39c55bb04f12 (patch) | |
| tree | 1ed428454239efcc2f13d951557709af15b46dba /libavformat | |
| parent | 6bbb36221897b341282d7d403b98270ba52dd6fb (diff) | |
| download | ffmpeg-6e71c1202bbdca0a95680e07507b39c55bb04f12.tar.gz | |
rtsp: Make rtsp_open_transport_ctx() non-static
This is required for the upcoming RTSP listen mode.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtsp.c | 6 | ||||
| -rw-r--r-- | libavformat/rtsp.h | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 551884ba70..d4206a155e 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -595,7 +595,7 @@ void ff_rtsp_close_streams(AVFormatContext *s) av_free(rt->recvbuf); } -static int rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st) +int ff_rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st) { RTSPState *rt = s->priv_data; AVStream *st = NULL; @@ -1402,7 +1402,7 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, } } - if ((err = rtsp_open_transport_ctx(s, rtsp_st))) + if ((err = ff_rtsp_open_transport_ctx(s, rtsp_st))) goto fail; } @@ -1925,7 +1925,7 @@ static int sdp_read_header(AVFormatContext *s) err = AVERROR_INVALIDDATA; goto fail; } - if ((err = rtsp_open_transport_ctx(s, rtsp_st))) + if ((err = ff_rtsp_open_transport_ctx(s, rtsp_st))) goto fail; } return 0; diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 55743b5d2d..41bf8bbb8a 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -561,6 +561,11 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, */ void ff_rtsp_undo_setup(AVFormatContext *s); +/** + * Open RTSP transport context. + */ +int ff_rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st); + extern const AVOption ff_rtsp_options[]; #endif /* AVFORMAT_RTSP_H */ |