diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-05-25 23:04:09 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-05-25 23:04:09 +0000 |
| commit | fa3b98182d711f7735da6e820f90fbcf96cae4d7 (patch) | |
| tree | 7626aa54c7b0af1b68ada2dfbaabd46c96ec2f1c /libavutil/fifo.c | |
| parent | 0871ae1a930122f7124358a0ce3caf81876913a9 (diff) | |
Ensure that one can store X bytes in a fifo of size X.
Fixed issue417.
Originally committed as revision 13405 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/fifo.c')
| -rw-r--r-- | libavutil/fifo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavutil/fifo.c b/libavutil/fifo.c index f2ace514bd..eda3558436 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -22,8 +22,9 @@ #include "common.h" #include "fifo.h" -int av_fifo_init(AVFifoBuffer *f, int size) +int av_fifo_init(AVFifoBuffer *f, unsigned int size) { + size= FFMAX(size, size+1); f->wptr = f->rptr = f->buffer = av_malloc(size); f->end = f->buffer + size; @@ -56,7 +57,7 @@ int av_fifo_read(AVFifoBuffer *f, uint8_t *buf, int buf_size) void av_fifo_realloc(AVFifoBuffer *f, unsigned int new_size) { unsigned int old_size= f->end - f->buffer; - if(old_size < new_size){ + if(old_size <= new_size){ int len= av_fifo_size(f); AVFifoBuffer f2; |