RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 00:32:31 +00:00
Code Issues Projects Releases Wiki Activity

cosmetics (by Björn Axelsson)

Browse Source 
Originally committed as revision 12774 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Benoit Fouet 2008-04-09 11:36:50 +00:00
parent 49cec1998a
commit 95c76e1180
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavutil/fifo.c
View File

@ -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); 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; int total = size;
do { do {
int len = FFMIN(f->end - f->wptr, size); int len = FFMIN(f->end - f->wptr, size);
if(func) { if(func) {
if(func(buf, f->wptr, len) <= 0) if(func(src, f->wptr, len) <= 0)
break; break;
} else { } else {
memcpy(f->wptr, buf, len); memcpy(f->wptr, src, len);
buf = (uint8_t*)buf + len; src = (uint8_t*)src + len;
} }
f->wptr += len; f->wptr += len;
if (f->wptr >= f->end) if (f->wptr >= f->end)

8
libavutil/fifo.h
View File

@ -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. * Feeds data from a user supplied callback to an AVFifoBuffer.
* @param *f AVFifoBuffer to write to * @param *f AVFifoBuffer to write to
* @param *buf data source * @param *src data source
* @param size number of bytes to write * @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. * second is dest_buf, third is dest_buf_size.
* func must return the number of bytes written to dest_buf, or <= 0 to * func must return the number of bytes written to dest_buf, or <= 0 to
* indicate no more data available to write. * 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. * @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. * Resizes an AVFifoBuffer.