Mercurial > libavutil.hg
changeset 564:a1ac1cb9a91b libavutil
Implement av_fifo_realloc2().
| author | stefano |
|---|---|
| date | Tue, 19 Aug 2008 18:43:34 +0000 |
| parents | daccf2fe1053 |
| children | a0dab9157d6a |
| files | avutil.h fifo.c fifo.h |
| diffstat | 3 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/avutil.h Sun Aug 17 19:32:51 2008 +0000 +++ b/avutil.h Tue Aug 19 18:43:34 2008 +0000 @@ -35,7 +35,7 @@ #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) #define LIBAVUTIL_VERSION_MAJOR 49 -#define LIBAVUTIL_VERSION_MINOR 9 +#define LIBAVUTIL_VERSION_MINOR 10 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
--- a/fifo.c Sun Aug 17 19:32:51 2008 +0000 +++ b/fifo.c Tue Aug 19 18:43:34 2008 +0000 @@ -55,18 +55,24 @@ * Resizes a FIFO. */ void av_fifo_realloc(AVFifoBuffer *f, unsigned int new_size) { + av_fifo_realloc2(f, new_size); +} + +int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) { unsigned int old_size= f->end - f->buffer; if(old_size <= new_size){ int len= av_fifo_size(f); AVFifoBuffer f2; - av_fifo_init(&f2, new_size); + if (av_fifo_init(&f2, new_size) < 0) + return -1; av_fifo_read(f, f2.buffer, len); f2.wptr += len; av_free(f->buffer); *f= f2; } + return 0; } void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int size)
--- a/fifo.h Sun Aug 17 19:32:51 2008 +0000 +++ b/fifo.h Tue Aug 19 18:43:34 2008 +0000 @@ -97,10 +97,19 @@ * Resizes an AVFifoBuffer. * @param *f AVFifoBuffer to resize * @param size new AVFifoBuffer size in bytes + * @see av_fifo_realloc2() */ void av_fifo_realloc(AVFifoBuffer *f, unsigned int size); /** + * Resizes an AVFifoBuffer. + * @param *f AVFifoBuffer to resize + * @param size new AVFifoBuffer size in bytes + * @return <0 for failure >=0 otherwise + */ +int av_fifo_realloc2(AVFifoBuffer *f, unsigned int size); + +/** * Reads and discards the specified amount of data from an AVFifoBuffer. * @param *f AVFifoBuffer to read from * @param size amount of data to read in bytes