@ -1116,14 +1116,14 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port,
" ?localport=%d " , j ) ;
" ?localport=%d " , j ) ;
/* we will use two ports per rtp stream (rtp and rtcp) */
/* we will use two ports per rtp stream (rtp and rtcp) */
j + = 2 ;
j + = 2 ;
if ( ffurl_open ( & rtsp_st - > rtp_handle , buf , AVIO_RDWR ) = = 0 )
if ( ffurl_open ( & rtsp_st - > rtp_handle , buf , AVIO_FLAG_ REA D_ WRITE ) = = 0 )
goto rtp_opened ;
goto rtp_opened ;
}
}
}
}
#if 0
#if 0
/* then try on any port */
/* then try on any port */
if ( ffurl_open ( & rtsp_st - > rtp_handle , " rtp:// " , AVIO_RDONLY ) < 0 ) {
if ( ffurl_open ( & rtsp_st - > rtp_handle , " rtp:// " , AVIO_FLAG_ REA D ) < 0 ) {
err = AVERROR_INVALIDDATA ;
err = AVERROR_INVALIDDATA ;
goto fail ;
goto fail ;
}
}
@ -1269,7 +1269,7 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port,
namebuf , sizeof ( namebuf ) , NULL , 0 , NI_NUMERICHOST ) ;
namebuf , sizeof ( namebuf ) , NULL , 0 , NI_NUMERICHOST ) ;
ff_url_join ( url , sizeof ( url ) , " rtp " , NULL , namebuf ,
ff_url_join ( url , sizeof ( url ) , " rtp " , NULL , namebuf ,
port , " ?ttl=%d " , ttl ) ;
port , " ?ttl=%d " , ttl ) ;
if ( ffurl_open ( & rtsp_st - > rtp_handle , url , AVIO_RDWR ) < 0 ) {
if ( ffurl_open ( & rtsp_st - > rtp_handle , url , AVIO_FLAG_ REA D_ WRITE ) < 0 ) {
err = AVERROR_INVALIDDATA ;
err = AVERROR_INVALIDDATA ;
goto fail ;
goto fail ;
}
}
@ -1396,7 +1396,7 @@ redirect:
av_get_random_seed ( ) , av_get_random_seed ( ) ) ;
av_get_random_seed ( ) , av_get_random_seed ( ) ) ;
/* GET requests */
/* GET requests */
if ( ffurl_alloc ( & rt - > rtsp_hd , httpname , AVIO_RDONLY ) < 0 ) {
if ( ffurl_alloc ( & rt - > rtsp_hd , httpname , AVIO_FLAG_ REA D ) < 0 ) {
err = AVERROR ( EIO ) ;
err = AVERROR ( EIO ) ;
goto fail ;
goto fail ;
}
}
@ -1417,7 +1417,7 @@ redirect:
}
}
/* POST requests */
/* POST requests */
if ( ffurl_alloc ( & rt - > rtsp_hd_out , httpname , AVIO_WRONLY ) < 0 ) {
if ( ffurl_alloc ( & rt - > rtsp_hd_out , httpname , AVIO_FLAG_WRITE ) < 0 ) {
err = AVERROR ( EIO ) ;
err = AVERROR ( EIO ) ;
goto fail ;
goto fail ;
}
}
@ -1460,7 +1460,7 @@ redirect:
} else {
} else {
/* open the tcp connection */
/* open the tcp connection */
ff_url_join ( tcpname , sizeof ( tcpname ) , " tcp " , NULL , host , port , NULL ) ;
ff_url_join ( tcpname , sizeof ( tcpname ) , " tcp " , NULL , host , port , NULL ) ;
if ( ffurl_open ( & rt - > rtsp_hd , tcpname , AVIO_RDWR ) < 0 ) {
if ( ffurl_open ( & rt - > rtsp_hd , tcpname , AVIO_FLAG_ REA D_ WRITE ) < 0 ) {
err = AVERROR ( EIO ) ;
err = AVERROR ( EIO ) ;
goto fail ;
goto fail ;
}
}
@ -1807,7 +1807,7 @@ static int sdp_read_header(AVFormatContext *s, AVFormatParameters *ap)
namebuf , rtsp_st - > sdp_port ,
namebuf , rtsp_st - > sdp_port ,
" ?localport=%d&ttl=%d " , rtsp_st - > sdp_port ,
" ?localport=%d&ttl=%d " , rtsp_st - > sdp_port ,
rtsp_st - > sdp_ttl ) ;
rtsp_st - > sdp_ttl ) ;
if ( ffurl_open ( & rtsp_st - > rtp_handle , url , AVIO_RDWR ) < 0 ) {
if ( ffurl_open ( & rtsp_st - > rtp_handle , url , AVIO_FLAG_ REA D_ WRITE ) < 0 ) {
err = AVERROR_INVALIDDATA ;
err = AVERROR_INVALIDDATA ;
goto fail ;
goto fail ;
}
}
@ -1863,7 +1863,7 @@ static int rtp_read_header(AVFormatContext *s,
if ( ! ff_network_init ( ) )
if ( ! ff_network_init ( ) )
return AVERROR ( EIO ) ;
return AVERROR ( EIO ) ;
ret = ffurl_open ( & in , s - > filename , AVIO_RDONLY ) ;
ret = ffurl_open ( & in , s - > filename , AVIO_FLAG_ REA D ) ;
if ( ret )
if ( ret )
goto fail ;
goto fail ;