# HG changeset patch # User benoit # Date 1207741010 0 # Node ID 97dd9756349c4766067290c510fcc1276819000c # Parent 75f096258d1439f4093cf4a4ad9c7699f7a9284d cosmetics (by Bj«Órn Axelsson) diff -r 75f096258d14 -r 97dd9756349c fifo.c --- a/fifo.c Wed Apr 09 11:35:16 2008 +0000 +++ b/fifo.c Wed Apr 09 11:36:50 2008 +0000 @@ -76,17 +76,17 @@ 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 -r 75f096258d14 -r 97dd9756349c fifo.h --- a/fifo.h Wed Apr 09 11:35:16 2008 +0000 +++ b/fifo.h Wed Apr 09 11:36:50 2008 +0000 @@ -81,16 +81,16 @@ /** * 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.