[FFmpeg-cvslog] udp: simplify 7a032cb97f743a651138d2da6214c79e0ce089dd

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov  9 03:51:08 2011 +0100| [b2bdca1b4a739992779f6641fcc122cffb240eb6] | committer: Michael Niedermayer

udp: simplify 7a032cb97f743a651138d2da6214c79e0ce089dd

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2bdca1b4a739992779f6641fcc122cffb240eb6
---

 libavformat/udp.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/libavformat/udp.c b/libavformat/udp.c
index 59d1f74..dd80bb0 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -546,19 +546,16 @@ static int udp_read(URLContext *h, uint8_t *buf, int size)
             avail = av_fifo_size(s->fifo);
             if (avail) { // >=size) {
                 uint8_t tmp[4];
-                int skip = 0;
 
                 av_fifo_generic_read(s->fifo, tmp, 4, NULL);
                 avail= AV_RL32(tmp);
                 if(avail > size){
                     av_log(h, AV_LOG_WARNING, "Part of datagram lost due to insufficient buffer size\n");
-                    skip = avail - size;
                     avail= size;
                 }
 
                 av_fifo_generic_read(s->fifo, buf, avail, NULL);
-                if (skip)
-                    av_fifo_drain(s->fifo, skip);
+                av_fifo_drain(s->fifo, AV_RL32(tmp) - avail);
                 return avail;
             }
             else {