summaryrefslogtreecommitdiff
path: root/libavformat/rtpproto.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-01 11:53:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-01 11:53:54 +0200
commitb39f012dee7aac577b43c51a7119955e7509a72b (patch)
tree2b3c4bbfe550ff54d2e5792802e98bcd6235ad06 /libavformat/rtpproto.c
parentd2c613dd1460a34ca166550d5d9d8cdd5cf278df (diff)
parent7531588fffbca1f0afdcc06635999c00dfc16ca6 (diff)
Merge commit '7531588fffbca1f0afdcc06635999c00dfc16ca6'
* commit '7531588fffbca1f0afdcc06635999c00dfc16ca6': rtpproto: Remove a misplaced comment Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpproto.c')
-rw-r--r--libavformat/rtpproto.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
index 6b28f84f2e..4b0b933c54 100644
--- a/libavformat/rtpproto.c
+++ b/libavformat/rtpproto.c
@@ -332,7 +332,6 @@ static int rtp_read(URLContext *h, uint8_t *buf, int size)
for(;;) {
if (ff_check_interrupt(&h->interrupt_callback))
return AVERROR_EXIT;
- /* build fdset to listen to RTP and RTCP packets */
n = poll(p, 2, poll_delay);
if (n > 0) {
/* first try RTCP */