[FFmpeg-cvslog] r12774 - in trunk/libavutil: fifo.c fifo.h
benoit
subversion
Wed Apr 9 13:36:50 CEST 2008
Author: benoit
Date: Wed Apr 9 13:36:50 2008
New Revision: 12774
Log:
cosmetics (by Bj?rn Axelsson)
Modified:
trunk/libavutil/fifo.c
trunk/libavutil/fifo.h
Modified: trunk/libavutil/fifo.c
==============================================================================
--- trunk/libavutil/fifo.c (original)
+++ trunk/libavutil/fifo.c Wed Apr 9 13:36:50 2008
@@ -76,17 +76,17 @@ void av_fifo_write(AVFifoBuffer *f, cons
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)
Modified: trunk/libavutil/fifo.h
==============================================================================
--- trunk/libavutil/fifo.h (original)
+++ trunk/libavutil/fifo.h Wed Apr 9 13:36:50 2008
@@ -81,16 +81,16 @@ attribute_deprecated void av_fifo_write(
/**
* 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.
More information about the ffmpeg-cvslog
mailing list