Commit b2bdca1b authored by Michael Niedermayer's avatar Michael Niedermayer

udp: simplify 7a032cb9

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7a032cb9
...@@ -546,19 +546,16 @@ static int udp_read(URLContext *h, uint8_t *buf, int size) ...@@ -546,19 +546,16 @@ static int udp_read(URLContext *h, uint8_t *buf, int size)
avail = av_fifo_size(s->fifo); avail = av_fifo_size(s->fifo);
if (avail) { // >=size) { if (avail) { // >=size) {
uint8_t tmp[4]; uint8_t tmp[4];
int skip = 0;
av_fifo_generic_read(s->fifo, tmp, 4, NULL); av_fifo_generic_read(s->fifo, tmp, 4, NULL);
avail= AV_RL32(tmp); avail= AV_RL32(tmp);
if(avail > size){ if(avail > size){
av_log(h, AV_LOG_WARNING, "Part of datagram lost due to insufficient buffer size\n"); av_log(h, AV_LOG_WARNING, "Part of datagram lost due to insufficient buffer size\n");
skip = avail - size;
avail= size; avail= size;
} }
av_fifo_generic_read(s->fifo, buf, avail, NULL); av_fifo_generic_read(s->fifo, buf, avail, NULL);
if (skip) av_fifo_drain(s->fifo, AV_RL32(tmp) - avail);
av_fifo_drain(s->fifo, skip);
return avail; return avail;
} }
else { else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment