# HG changeset patch # User michael # Date 1169064331 0 # Node ID 0b93dab98397fcc915772dcce369abeaf1232ff2 # Parent a9880a7685e7c16ce2607391a87b004723a06fd8 simplify av_fifo_realloc() diff -r a9880a7685e7 -r 0b93dab98397 fifo.c --- 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; } }