[libav-commits] rtsp: Make rtsp_open_transport_ctx() non-static

Jordi Ortiz git at libav.org
Tue Jul 10 21:00:52 CEST 2012


Module: libav
Branch: master
Commit: 6e71c1202bbdca0a95680e07507b39c55bb04f12

Author:    Jordi Ortiz <nenjordi at gmail.com>
Committer: Martin Storsjö <martin at martin.st>
Date:      Tue Jul 10 19:25:04 2012 +0200

rtsp: Make rtsp_open_transport_ctx() non-static

This is required for the upcoming RTSP listen mode.

Signed-off-by: Martin Storsjö <martin at martin.st>

---

 libavformat/rtsp.c |    6 +++---
 libavformat/rtsp.h |    5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 551884b..d4206a1 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 55743b5..41bf8bb 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 */



More information about the libav-commits mailing list