[SCM] libav/experimental: If local port n is not available, try n + 2 instead of continuing to bind on n (allow to receive 2 rtsp streams simultaneously with libavformat)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:08:49 UTC 2013


The following commit has been merged in the experimental branch:
commit ecdcbbf66a0242ae93499824ff5aaff9f4d1bd77
Author: Luca Abeni <lucabe72 at email.it>
Date:   Tue Oct 30 08:10:45 2007 +0000

    If local port n is not available, try n + 2 instead of continuing to bind
    on n (allow to receive 2 rtsp streams simultaneously with libavformat)
    
    Originally committed as revision 10876 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 9ef7f1f..0857c5d 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -934,8 +934,8 @@ static int rtsp_read_header(AVFormatContext *s,
             if (RTSP_RTP_PORT_MIN != 0) {
                 while(j <= RTSP_RTP_PORT_MAX) {
                     snprintf(buf, sizeof(buf), "rtp://?localport=%d", j);
+                    j += 2; /* we will use two port by rtp stream (rtp and rtcp) */
                     if (url_open(&rtsp_st->rtp_handle, buf, URL_RDWR) == 0) {
-                        j += 2; /* we will use two port by rtp stream (rtp and rtcp) */
                         goto rtp_opened;
                     }
                 }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list