Browse code

rtsp: Make make_setup_request a nonstatic function

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit fef5649a820b30432578e1440776e7a71bd523cc)

Martin Storsjo authored on 2011/01/24 18:49:01
Showing 2 changed files
... ...
@@ -1017,7 +1017,7 @@ retry:
1017 1017
 /**
1018 1018
  * @return 0 on success, <0 on error, 1 if protocol is unavailable.
1019 1019
  */
1020
-static int make_setup_request(AVFormatContext *s, const char *host, int port,
1020
+int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port,
1021 1021
                               int lower_transport, const char *real_challenge)
1022 1022
 {
1023 1023
     RTSPState *rt = s->priv_data;
... ...
@@ -1493,7 +1493,7 @@ redirect:
1493 1493
         int lower_transport = ff_log2_tab[lower_transport_mask &
1494 1494
                                   ~(lower_transport_mask - 1)];
1495 1495
 
1496
-        err = make_setup_request(s, host, port, lower_transport,
1496
+        err = ff_rtsp_make_setup_request(s, host, port, lower_transport,
1497 1497
                                  rt->server_type == RTSP_SERVER_REAL ?
1498 1498
                                      real_challenge : NULL);
1499 1499
         if (err < 0)
... ...
@@ -504,4 +504,11 @@ int ff_rtsp_tcp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
504 504
  */
505 505
 int ff_rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt);
506 506
 
507
+/**
508
+ * Do the SETUP requests for each stream for the chosen
509
+ * lower transport mode.
510
+ */
511
+int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port,
512
+                               int lower_transport, const char *real_challenge);
513
+
507 514
 #endif /* AVFORMAT_RTSP_H */