Commit 96e39edc authored by Michael Niedermayer's avatar Michael Niedermayer

simplify av_fifo_realloc()

Originally committed as revision 7571 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 765d4f3b
...@@ -60,18 +60,14 @@ void av_fifo_realloc(AVFifoBuffer *f, unsigned int new_size) { ...@@ -60,18 +60,14 @@ void av_fifo_realloc(AVFifoBuffer *f, unsigned int new_size) {
unsigned int old_size= f->end - f->buffer; unsigned int old_size= f->end - f->buffer;
if(old_size < new_size){ 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); av_fifo_init(&f2, new_size);
av_fifo_read(f, f2.buffer, len);
f->rptr += f->buffer - old; f2.wptr += len;
f->wptr += f->buffer - old; av_free(f->buffer);
*f= f2;
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;
} }
} }
......
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