Merge commit '7531588fffbca1f0afdcc06635999c00dfc16ca6'
* commit '7531588fffbca1f0afdcc06635999c00dfc16ca6': rtpproto: Remove a misplaced comment Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
b39f012dee
@ -332,7 +332,6 @@ static int rtp_read(URLContext *h, uint8_t *buf, int size)
|
|||||||
for(;;) {
|
for(;;) {
|
||||||
if (ff_check_interrupt(&h->interrupt_callback))
|
if (ff_check_interrupt(&h->interrupt_callback))
|
||||||
return AVERROR_EXIT;
|
return AVERROR_EXIT;
|
||||||
/* build fdset to listen to RTP and RTCP packets */
|
|
||||||
n = poll(p, 2, poll_delay);
|
n = poll(p, 2, poll_delay);
|
||||||
if (n > 0) {
|
if (n > 0) {
|
||||||
/* first try RTCP */
|
/* first try RTCP */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user