summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-05-25 22:20:39 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-05-25 22:20:39 +0000
commit0871ae1a930122f7124358a0ce3caf81876913a9 (patch)
tree8626d4af558891862dcd1ecc81cb1d949355eb3e /libavutil
parent46eab09341d3496ad680bb1bf609ea38c7deea66 (diff)
downloadffmpeg-0871ae1a930122f7124358a0ce3caf81876913a9.tar.gz
Make av_fifo*_read() ignore the available amount of data.
This is more efficient as in practice the check is redundant most of the time. Callers which do not know if enough data is available have to check it with av_fifo_size(). Doing the check in *read() means the caller has no choice to skip the check when its known to be redundant. Also the return value was never documented in a public header so changing it should not break the API. Besides this fixes the case where read() failed on a 100% full fifo. Originally committed as revision 13404 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/fifo.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 19ec13e63d..f2ace514bd 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -45,9 +45,6 @@ int av_fifo_size(AVFifoBuffer *f)
return size;
}
-/**
- * Get data from the fifo (returns -1 if not enough data).
- */
int av_fifo_read(AVFifoBuffer *f, uint8_t *buf, int buf_size)
{
return av_fifo_generic_read(f, buf_size, NULL, buf);
@@ -97,13 +94,8 @@ int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void
}
-/** get data from the fifo (return -1 if not enough data) */
int av_fifo_generic_read(AVFifoBuffer *f, int buf_size, void (*func)(void*, void*, int), void* dest)
{
- int size = av_fifo_size(f);
-
- if (size < buf_size)
- return -1;
do {
int len = FFMIN(f->end - f->rptr, buf_size);
if(func) func(dest, f->rptr, len);