aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-03-09 17:47:47 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-03-09 17:47:47 +0000
commit3898eed890f660d15d314964f7cbbbada3201e54 (patch)
treeb98a1f40748de91eeb28040c0e6570581d2ee740 /libavformat
parent60f75ad2458e3613b99e771be8514ca7165284d0 (diff)
downloadffmpeg-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 'libavformat')
-rw-r--r--libavformat/audiointerleave.c2
-rw-r--r--libavformat/mpegenc.c2
-rw-r--r--libavformat/swfenc.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c
index 11f0093d55..a3a6531348 100644
--- a/libavformat/audiointerleave.c
+++ b/libavformat/audiointerleave.c
@@ -80,7 +80,7 @@ static int ff_interleave_new_audio_packet(AVFormatContext *s, AVPacket *pkt,
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);
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 91cfa69bef..5b949feea1 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -914,7 +914,7 @@ static int flush_packet(AVFormatContext *ctx, int stream_index,
/* 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=
diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c
index 7ed8cc3553..8caf0d1007 100644
--- a/libavformat/swfenc.c
+++ b/libavformat/swfenc.c
@@ -419,7 +419,7 @@ static int swf_write_video(AVFormatContext *s,
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 */