[FFmpeg-cvslog] fix rtp 916 issue, patch 2
Dmitry Volyntsev
git at videolan.org
Wed Jan 18 16:39:34 CET 2012
ffmpeg | branch: master | Dmitry Volyntsev <xeioexception at gmail.com> | Wed Jan 18 13:54:16 2012 +0400| [4259d1eb99bf74e75806e0f460a1e099cce81e2d] | committer: Michael Niedermayer
fix rtp 916 issue, patch 2
Reviewed-by: Luca Abeni <lucabe72 at email.it>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4259d1eb99bf74e75806e0f460a1e099cce81e2d
---
libavformat/rtsp.c | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index ff1f857..56e5de2 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1161,16 +1161,14 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port,
}
/* first try in specified port range */
- if (RTSP_RTP_PORT_MIN != 0) {
- while (j <= RTSP_RTP_PORT_MAX) {
- ff_url_join(buf, sizeof(buf), "rtp", NULL, host, -1,
- "?localport=%d", j);
- /* we will use two ports per rtp stream (rtp and rtcp) */
- j += 2;
- if (ffurl_open(&rtsp_st->rtp_handle, buf, AVIO_FLAG_READ_WRITE,
- &s->interrupt_callback, NULL) == 0)
- goto rtp_opened;
- }
+ while (j <= RTSP_RTP_PORT_MAX) {
+ ff_url_join(buf, sizeof(buf), "rtp", NULL, host, -1,
+ "?localport=%d", j);
+ /* we will use two ports per rtp stream (rtp and rtcp) */
+ j += 2;
+ if (!ffurl_open(&rtsp_st->rtp_handle, buf, AVIO_FLAG_READ_WRITE,
+ &s->interrupt_callback, NULL))
+ goto rtp_opened;
}
av_log(s, AV_LOG_ERROR, "Unable to open an input RTP port\n");
err = AVERROR(EIO);
More information about the ffmpeg-cvslog
mailing list