[SCM] libav/experimental: rtsp: Make make_setup_request a nonstatic function

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit fef5649a820b30432578e1440776e7a71bd523cc
Author: Martin Storsjo <martin at martin.st>
Date:   Mon Jan 24 09:49:01 2011 +0000

    rtsp: Make make_setup_request a nonstatic function
    
    Signed-off-by: Janne Grunau <janne-ffmpeg at jannau.net>

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 2b61b89..feb6193 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1017,7 +1017,7 @@ retry:
 /**
  * @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)
 {
     RTSPState *rt = s->priv_data;
@@ -1493,7 +1493,7 @@ redirect:
         int lower_transport = ff_log2_tab[lower_transport_mask &
                                   ~(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 ?
                                      real_challenge : NULL);
         if (err < 0)
diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h
index eee07ac..2ef68db 100644
--- a/libavformat/rtsp.h
+++ b/libavformat/rtsp.h
@@ -504,4 +504,11 @@ int ff_rtsp_tcp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
  */
 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 */

-- 
Libav/FFmpeg packaging