On Wed, 4 Jul 2012, Jordi Ortiz wrote:

---
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 */
--
1.7.10

Ok as well, but you might try to improve the commit message. You shouldn't try to cram everything into the first line - try to make that one as short as possible while still describing the commit. If you need to say more than that, add extra full sentences below.

// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to