s/RTPFUNCTION/INTERLEAVEFUNCTION/

s/RTPDATA/INTERLEAVEDATA/

diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index d668085e5d1ba0eb4c68a4b95ae32bcf1a8394e6..21f4d904d2ad08632d05046cde734055dd535bd0 100644 (file)
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -401,7 +401,7 @@ follows:
 
 You will need to override these definitions if they are different on your
 system.
-.IP CURLOPT_RTPFUNCTION
+.IP CURLOPT_INTERLEAVEFUNCTION
 Function pointer that should match the following prototype: \fIsize_t
 function( void *ptr, size_t size, size_t nmemb, void *stream)\fP. This
 function gets called by libcurl as soon as it has received interleaved RTP
@@ -422,8 +422,8 @@ service RTP data when no requests are desired. If the application makes a
 request, (e.g.  \fICURL_RTSPREQ_PAUSE\fP) then the response handler will
 process any pending RTP data before marking the request as finished.  (Added
 in 7.20.0)
-.IP CURLOPT_RTPDATA
-This is the stream that will be passed to \fICURLOPT_RTPFUNCTION\fP when
+.IP CURLOPT_INTERLEAVEDATA
+This is the stream that will be passed to \fICURLOPT_INTERLEAVEFUNCTION\fP when
 interleaved RTP data is received. Since the application is required to provide
 a custom function for RTP data, there is no requirement that the stream
 pointer be a valid FILE pointer. An application may wish to pass a cookie

diff --git a/include/curl/curl.h b/include/curl/curl.h
index de709655d509e3d567abb8fa6bf7156ddd34e4d3..3f5c49a27df0f8c618d3cc4d836e1d0f33056d8d 100644 (file)
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -1309,11 +1309,11 @@ typedef enum {
   /* Manually initialize the server RTSP CSeq for this handle */
   CINIT(RTSP_SERVER_CSEQ, LONG, 194),
 
-  /* The stream to pass to RTPFUNCTION. */
-  CINIT(RTPDATA, OBJECTPOINT, 195),
+  /* The stream to pass to INTERLEAVEFUNCTION. */
+  CINIT(INTERLEAVEDATA, OBJECTPOINT, 195),
 
   /* Let the application define a custom write method for RTP data */
-  CINIT(RTPFUNCTION, FUNCTIONPOINT, 196),
+  CINIT(INTERLEAVEFUNCTION, FUNCTIONPOINT, 196),
 
   CURLOPT_LASTENTRY /* the last unused */
 } CURLoption;

diff --git a/lib/url.c b/lib/url.c
index 5b3ea65cd7226599bb6b3d14856be05d0c6aa946..f3ac14d5c503ec9248251faf7c0db149a2f86396 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -2430,10 +2430,10 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
     data->state.rtsp_next_client_CSeq = va_arg(param, long);
     break;
 
-  case CURLOPT_RTPDATA:
+  case CURLOPT_INTERLEAVEDATA:
     data->set.rtp_out = va_arg(param, void *);
     break;
-  case CURLOPT_RTPFUNCTION:
+  case CURLOPT_INTERLEAVEFUNCTION:
     /* Set the user defined RTP write function */
     data->set.fwrite_rtp = va_arg(param, curl_write_callback);
     break;