changeset 691:4e9e0c52ed08 libavutil

Reorder arguments for av_fifo_generic_read to be more logical and consistent with av_fifo_generic_write.
author reimar
date Mon, 09 Mar 2009 17:47:47 +0000
parents a2eb62aebb99
children 3f23085bdc04
files fifo.c fifo.h
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/fifo.c	Mon Mar 09 15:52:45 2009 +0000
+++ b/fifo.c	Mon Mar 09 17:47:47 2009 +0000
@@ -63,7 +63,7 @@
 
         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_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 {
--- a/fifo.h	Mon Mar 09 15:52:45 2009 +0000
+++ b/fifo.h	Mon Mar 09 17:47:47 2009 +0000
@@ -68,7 +68,7 @@
  * @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.