aboutsummaryrefslogtreecommitdiffstats
path: root/docs/libcurl/opts/CURLOPT_INTERLEAVEFUNCTION.3
diff options
context:
space:
mode:
authorAlex Deymo <deymo@google.com>2017-12-19 19:04:07 +0100
committerElliott Hughes <enh@google.com>2017-12-20 14:03:33 -0800
commit486467e11b5904b3e04adc2f5fdb96fcfe65da84 (patch)
tree492c1de56730f0b42bba1f651aa78c8cac13cfa7 /docs/libcurl/opts/CURLOPT_INTERLEAVEFUNCTION.3
parent7d91b4f63bd1fd29c11c9ff1ba6e7c42622e0687 (diff)
downloadexternal_curl-486467e11b5904b3e04adc2f5fdb96fcfe65da84.tar.gz
external_curl-486467e11b5904b3e04adc2f5fdb96fcfe65da84.tar.bz2
external_curl-486467e11b5904b3e04adc2f5fdb96fcfe65da84.zip
Update from 7.55.1 to 7.57.0
Update the local patch to match the new config. Removed the packages/Android/Android.mk file added by upstream (outdated Android.mk version which will confuse people). Updated Android.bp with the new files. Bug: http://b/70741465 Test: builds, boots, `vendor/google/tools/fake-ota on streaming` works Change-Id: Ib2411f5e64db4e11ffd916dc81cd23b46888b900
Diffstat (limited to 'docs/libcurl/opts/CURLOPT_INTERLEAVEFUNCTION.3')
-rw-r--r--docs/libcurl/opts/CURLOPT_INTERLEAVEFUNCTION.310
1 files changed, 7 insertions, 3 deletions
diff --git a/docs/libcurl/opts/CURLOPT_INTERLEAVEFUNCTION.3 b/docs/libcurl/opts/CURLOPT_INTERLEAVEFUNCTION.3
index 88e39d76..2a318744 100644
--- a/docs/libcurl/opts/CURLOPT_INTERLEAVEFUNCTION.3
+++ b/docs/libcurl/opts/CURLOPT_INTERLEAVEFUNCTION.3
@@ -20,7 +20,7 @@
.\" *
.\" **************************************************************************
.\"
-.TH CURLOPT_INTERLEAVEFUNCTION 3 "May 31, 2017" "libcurl 7.55.1" "curl_easy_setopt options"
+.TH CURLOPT_INTERLEAVEFUNCTION 3 "September 15, 2017" "libcurl 7.57.0" "curl_easy_setopt options"
.SH NAME
CURLOPT_INTERLEAVEFUNCTION \- callback function for RTSP interleaved data
@@ -55,8 +55,12 @@ connection may close. The application may use \fICURL_RTSPREQ_RECEIVE\fP to
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.
+
+The \fICURLOPT_WRITEDATA(3)\fP is passed in the \fIuserdata\fP argument in the
+callback.
.SH DEFAULT
-NULL
+NULL, the interleave data is then passed to the regular write function:
+\fICURLOPT_WRITEFUNCTION(3)\fP.
.SH PROTOCOLS
RTSP
.SH EXAMPLE
@@ -78,4 +82,4 @@ Added in 7.20.0
.SH RETURN VALUE
Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not.
.SH "SEE ALSO"
-.BR CURLOPT_INTERLEAVEFUNCTION "(3), " CURLOPT_RTSP_REQUEST "(3), "
+.BR CURLOPT_INTERLEAVEDATA "(3), " CURLOPT_RTSP_REQUEST "(3), "