cosmetics (by Björn Axelsson)

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12774 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 08b5977a1a7c2e41f52b0d481b83ae60376579f5..19ec13e63d0716e7515fbe86c0d82f08ce2e7ff9 100644 (file)
--- 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 fccb322dbfa615cdfb4bed1088e8dd3f13755065..3dd27bd1fffbf5597e591d026052eedf4974c044 100644 (file)
--- 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.