Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio

This commit is contained in:
Lennart Poettering 2009-04-05 03:05:51 +02:00
commit 6ba3333030
41 changed files with 4140 additions and 2911 deletions

View file

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