Mercurial > libavutil.hg

changeset 225:0b93dab98397 libavutil

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify av_fifo_realloc()
author michael
date Wed, 17 Jan 2007 20:05:31 +0000
parents a9880a7685e7
children fb0c5c158c67
files fifo.c
diffstat 1 files changed, 7 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/fifo.c	Wed Jan 17 19:46:33 2007 +0000
+++ b/fifo.c	Wed Jan 17 20:05:31 2007 +0000
@@ -60,18 +60,14 @@
     unsigned int old_size= f->end - f->buffer;
 
     if(old_size < new_size){
-        uint8_t *old= f->buffer;
-
-        f->buffer= av_realloc(f->buffer, new_size);
+        int len= av_fifo_size(f);
+        AVFifoBuffer f2;
 
-        f->rptr += f->buffer - old;
-        f->wptr += f->buffer - old;
-
-        if(f->wptr < f->rptr){
-            memmove(f->rptr + new_size - old_size, f->rptr, f->buffer + old_size - f->rptr);
-            f->rptr += new_size - old_size;
-        }
-        f->end= f->buffer + new_size;
+        av_fifo_init(&f2, new_size);
+        av_fifo_read(f, f2.buffer, len);
+        f2.wptr += len;
+        av_free(f->buffer);
+        *f= f2;
     }
 }