luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s/RTPFUNCTION/INTERLEAVEFUNCTION/

Browse Source 
s/RTPDATA/INTERLEAVEDATA/
This commit is contained in:
Daniel Stenberg 2010-01-22 12:17:03 +00:00
parent 4a8570313a
commit 844c19cc5b
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/libcurl/curl_easy_setopt.3
View File

@ -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

6
include/curl/curl.h
View File

@ -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;

4
lib/url.c
View File

@ -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;