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
This commit is contained in:
Michael Niedermayer
2008-05-25 23:04:09 +00:00
parent 0871ae1a93
commit fa3b98182d
4 changed files with 6 additions and 5 deletions

View File

@ -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;