mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-08 13:29:59 -05:00
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
This commit is contained in:
commit
6ba3333030
41 changed files with 4140 additions and 2911 deletions
|
|
@ -229,7 +229,7 @@ static int rtpoll_work_cb(pa_rtpoll_item *i) {
|
|||
}
|
||||
}
|
||||
|
||||
/* Check wheter there was a timestamp overflow */
|
||||
/* Check whether there was a timestamp overflow */
|
||||
k = (int64_t) s->rtp_context.timestamp - (int64_t) s->offset;
|
||||
j = (int64_t) 0x100000000LL - (int64_t) s->offset + (int64_t) s->rtp_context.timestamp;
|
||||
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) {
|
|||
}
|
||||
if (!strlen(s2)) {
|
||||
/* End of headers */
|
||||
/* We will have a header left from our looping itteration, so add it in :) */
|
||||
/* We will have a header left from our looping iteration, so add it in :) */
|
||||
if (c->last_header) {
|
||||
/* This is not a continuation header so let's dump it into our proplist */
|
||||
pa_headerlist_puts(c->response_headers, c->last_header, pa_strbuf_tostring_free(c->header_buffer));
|
||||
|
|
@ -488,7 +488,7 @@ int pa_rtsp_record(pa_rtsp_client* c, uint16_t* seq, uint32_t* rtptime) {
|
|||
|
||||
pa_assert(c);
|
||||
if (!c->session) {
|
||||
/* No seesion in progres */
|
||||
/* No session in progress */
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue