Mercurial > libavutil.hg

changeset 222:a8a9454b0874 libavutil

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify
author michael
date Wed, 17 Jan 2007 19:19:03 +0000
parents 6ff860ccdcff
children df2f250bda3f
files fifo.c
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/fifo.c	Wed Jan 17 00:49:48 2007 +0000
+++ b/fifo.c	Wed Jan 17 19:19:03 2007 +0000
@@ -50,15 +50,12 @@
  */
 int av_fifo_read(AVFifoBuffer *f, uint8_t *buf, int buf_size)
 {
-    int len;
-    int size = f->wptr - f->rptr;
-    if (size < 0)
-        size += f->end - f->buffer;
+    int size = av_fifo_size(f);
 
     if (size < buf_size)
         return -1;
     while (buf_size > 0) {
-        len = FFMIN(f->end - f->rptr, buf_size);
+        int len = FFMIN(f->end - f->rptr, buf_size);
         memcpy(buf, f->rptr, len);
         buf += len;
         f->rptr += len;