RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-07 21:17:58 +00:00
Code Issues Projects Releases Wiki Activity

fifo: apply misc cosmetic fixes

Browse Source
This commit is contained in:
Stefano Sabatini 2011-08-13 19:10:05 +02:00
parent 323b930699
commit f1b29223e6
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavutil/fifo.c
View File

@ -25,7 +25,7 @@
AVFifoBuffer *av_fifo_alloc(unsigned int size) AVFifoBuffer *av_fifo_alloc(unsigned int size)
{ {
AVFifoBuffer *f= av_mallocz(sizeof(AVFifoBuffer)); AVFifoBuffer *f= av_mallocz(sizeof(AVFifoBuffer));
if(!f) if (!f)
return NULL; return NULL;
f->buffer = av_malloc(size); f->buffer = av_malloc(size);
f->end = f->buffer + size; f->end = f->buffer + size;
@ -37,7 +37,7 @@ AVFifoBuffer *av_fifo_alloc(unsigned int size)
void av_fifo_free(AVFifoBuffer *f) void av_fifo_free(AVFifoBuffer *f)
{ {
if(f){ if (f) {
av_freep(&f->buffer); av_freep(&f->buffer);
av_free(f); av_free(f);
} }
@ -59,12 +59,13 @@ int av_fifo_space(AVFifoBuffer *f)
return f->end - f->buffer - av_fifo_size(f); return f->end - f->buffer - av_fifo_size(f);
} }
int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) { int av_fifo_realloc2(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) {
int len= av_fifo_size(f); int len = av_fifo_size(f);
AVFifoBuffer *f2= av_fifo_alloc(new_size); AVFifoBuffer *f2 = av_fifo_alloc(new_size);
if (!f2) if (!f2)
return -1; return -1;
@ -72,7 +73,7 @@ int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) {
f2->wptr += len; f2->wptr += len;
f2->wndx += len; f2->wndx += len;
av_free(f->buffer); av_free(f->buffer);
*f= *f2; *f = *f2;
av_free(f2); av_free(f2);
} }
return 0; return 0;
@ -84,8 +85,8 @@ int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void
int total = size; int total = size;
do { do {
int len = FFMIN(f->end - f->wptr, size); int len = FFMIN(f->end - f->wptr, size);
if(func) { if (func) {
if(func(src, f->wptr, len) <= 0) if (func(src, f->wptr, len) <= 0)
break; break;
} else { } else {
memcpy(f->wptr, src, len); memcpy(f->wptr, src, len);