Mercurial > libavformat.hg

changeset 4689:fc0a165de804 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 0905585d48fd
children 2249417477c5
files audiointerleave.c mpegenc.c swfenc.c
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/audiointerleave.c	Mon Mar 09 13:08:19 2009 +0000
+++ b/audiointerleave.c	Mon Mar 09 17:47:47 2009 +0000
@@ -80,7 +80,7 @@
         return 0;
 
     av_new_packet(pkt, size);
-    av_fifo_generic_read(aic->fifo, size, NULL, pkt->data);
+    av_fifo_generic_read(aic->fifo, pkt->data, size, NULL);
 
     pkt->dts = pkt->pts = aic->dts;
     pkt->duration = av_rescale_q(*aic->samples, st->time_base, aic->time_base);
--- a/mpegenc.c	Mon Mar 09 13:08:19 2009 +0000
+++ b/mpegenc.c	Mon Mar 09 17:47:47 2009 +0000
@@ -914,7 +914,7 @@
 
         /* output data */
         assert(payload_size - stuffing_size <= av_fifo_size(stream->fifo));
-        av_fifo_generic_read(stream->fifo, payload_size - stuffing_size, &put_buffer, ctx->pb);
+        av_fifo_generic_read(stream->fifo, ctx->pb, payload_size - stuffing_size, &put_buffer);
         stream->bytes_to_iframe -= payload_size - stuffing_size;
     }else{
         payload_size=
--- a/swfenc.c	Mon Mar 09 13:08:19 2009 +0000
+++ b/swfenc.c	Mon Mar 09 17:47:47 2009 +0000
@@ -419,7 +419,7 @@
         put_swf_tag(s, TAG_STREAMBLOCK | TAG_LONG);
         put_le16(pb, swf->sound_samples);
         put_le16(pb, 0); // seek samples
-        av_fifo_generic_read(swf->audio_fifo, frame_size, &put_buffer, pb);
+        av_fifo_generic_read(swf->audio_fifo, pb, frame_size, &put_buffer);
         put_swf_end_tag(s);
 
         /* update FIFO */