[SCM] libav/experimental: simplify av_fifo_realloc()
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:55:08 UTC 2013
The following commit has been merged in the experimental branch:
commit 96e39edc59ca87793c6c196af7d02778e644ad62
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Wed Jan 17 20:05:31 2007 +0000
simplify av_fifo_realloc()
Originally committed as revision 7571 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 0f53084..48cd777 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -60,18 +60,14 @@ void av_fifo_realloc(AVFifoBuffer *f, unsigned int new_size) {
unsigned int old_size= f->end - f->buffer;
if(old_size < new_size){
- uint8_t *old= f->buffer;
+ int len= av_fifo_size(f);
+ AVFifoBuffer f2;
- f->buffer= av_realloc(f->buffer, new_size);
-
- 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;
}
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list