Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

lavu/fifo: simplify av_fifo_alloc()

Browse source 
Turn it into a wrapper around av_fifo_alloc_array().
This commit is contained in:
Anton Khirnov 2021-12-30 13:44:06 +01:00
parent 63b013aa68
commit 5010c481d1
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libavutil/fifo.c
View file

@ -24,9 +24,10 @@
#include "common.h" #include "common.h"
#include "fifo.h" #include "fifo.h"
static AVFifoBuffer *fifo_alloc_common(void *buffer, size_t size) AVFifoBuffer *av_fifo_alloc_array(size_t nmemb, size_t size)
{ {
AVFifoBuffer *f; AVFifoBuffer *f;
void *buffer = av_malloc_array(nmemb, size);
if (!buffer) if (!buffer)
return NULL; return NULL;
f = av_mallocz(sizeof(AVFifoBuffer)); f = av_mallocz(sizeof(AVFifoBuffer));
@ -35,21 +36,14 @@ static AVFifoBuffer *fifo_alloc_common(void *buffer, size_t size)
return NULL; return NULL;
} }
f->buffer = buffer; f->buffer = buffer;
f->end = f->buffer + size; f->end = f->buffer + nmemb * size;
av_fifo_reset(f); av_fifo_reset(f);
return f; return f;
} }
AVFifoBuffer *av_fifo_alloc(unsigned int size) AVFifoBuffer *av_fifo_alloc(unsigned int size)
{ {
void *buffer = av_malloc(size); return av_fifo_alloc_array(size, 1);
return fifo_alloc_common(buffer, size);
}
AVFifoBuffer *av_fifo_alloc_array(size_t nmemb, size_t size)
{
void *buffer = av_malloc_array(nmemb, size);
return fifo_alloc_common(buffer, nmemb * size);
} }
void av_fifo_free(AVFifoBuffer *f) void av_fifo_free(AVFifoBuffer *f)