diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-09 17:47:47 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-09 17:47:47 +0000 |
| commit | 3898eed890f660d15d314964f7cbbbada3201e54 (patch) | |
| tree | b98a1f40748de91eeb28040c0e6570581d2ee740 /libavutil | |
| parent | 60f75ad2458e3613b99e771be8514ca7165284d0 (diff) | |
| download | ffmpeg-3898eed890f660d15d314964f7cbbbada3201e54.tar.gz | |
Reorder arguments for av_fifo_generic_read to be more logical and
consistent with av_fifo_generic_write.
Originally committed as revision 17914 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/fifo.c | 4 | ||||
| -rw-r--r-- | libavutil/fifo.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/fifo.c b/libavutil/fifo.c index 9a9a139f3b..52ace0e22c 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -63,7 +63,7 @@ int av_fifo_realloc2(AVFifoBuffer *f, unsigned int new_size) { if (!f2) return -1; - av_fifo_generic_read(f, len, NULL, f2->buffer); + av_fifo_generic_read(f, f2->buffer, len, NULL); f2->wptr += len; f2->wndx += len; av_free(f->buffer); @@ -96,7 +96,7 @@ int av_fifo_generic_write(AVFifoBuffer *f, void *src, int size, int (*func)(void } -int av_fifo_generic_read(AVFifoBuffer *f, int buf_size, void (*func)(void*, void*, int), void* dest) +int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int)) { // Read memory barrier needed for SMP here in theory do { diff --git a/libavutil/fifo.h b/libavutil/fifo.h index f64914f7c6..d353844715 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -68,7 +68,7 @@ int av_fifo_size(AVFifoBuffer *f); * @param *func generic read function * @param *dest data destination */ -int av_fifo_generic_read(AVFifoBuffer *f, int buf_size, void (*func)(void*, void*, int), void* dest); +int av_fifo_generic_read(AVFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int)); /** * Feeds data from a user-supplied callback to an AVFifoBuffer. |