aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorBenoit Fouet <benoit.fouet@free.fr>2008-04-09 11:36:50 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2008-04-09 11:36:50 +0000
commit95c76e11805abf8e14ffbec64b9c23d32ea563ef (patch)
tree489c99f655a847166737b3032662e31b2f60999d /libavutil
parent49cec1998af4c8806f4981d12daa28091ccb0425 (diff)
downloadffmpeg-95c76e11805abf8e14ffbec64b9c23d32ea563ef.tar.gz
cosmetics (by Björn Axelsson)
Originally committed as revision 12774 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/fifo.c8
-rw-r--r--libavutil/fifo.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 08b5977a1a..19ec13e63d 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -76,17 +76,17 @@ void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int size)
av_fifo_generic_write(f, (void *)buf, size, NULL);
}
-int av_fifo_generic_write(AVFifoBuffer *f, void *buf, int size, int (*func)(void*, void*, int))
+int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int))
{
int total = size;
do {
int len = FFMIN(f->end - f->wptr, size);
if(func) {
- if(func(buf, f->wptr, len) <= 0)
+ if(func(src, f->wptr, len) <= 0)
break;
} else {
- memcpy(f->wptr, buf, len);
- buf = (uint8_t*)buf + len;
+ memcpy(f->wptr, src, len);
+ src = (uint8_t*)src + len;
}
f->wptr += len;
if (f->wptr >= f->end)
diff --git a/libavutil/fifo.h b/libavutil/fifo.h
index fccb322dbf..3dd27bd1ff 100644
--- a/libavutil/fifo.h
+++ b/libavutil/fifo.h
@@ -81,16 +81,16 @@ attribute_deprecated void av_fifo_write(AVFifoBuffer *f, const uint8_t *buf, int
/**
* Feeds data from a user supplied callback to an AVFifoBuffer.
* @param *f AVFifoBuffer to write to
- * @param *buf data source
+ * @param *src data source
* @param size number of bytes to write
- * @param *func generic write function. First parameter is buf,
+ * @param *func generic write function. First parameter is src,
* second is dest_buf, third is dest_buf_size.
* func must return the number of bytes written to dest_buf, or <= 0 to
* indicate no more data available to write.
- * If func is NULL, buf is interpreted as a simple byte array for source data.
+ * If func is NULL, src is interpreted as a simple byte array for source data.
* @return the number of bytes written to the fifo.
*/
-int av_fifo_generic_write(AVFifoBuffer *f, void *buf, int size, int (*func)(void*, void*, int));
+int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int));
/**
* Resizes an AVFifoBuffer.