diff options
author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-09 20:47:47 +0300 |
---|---|---|
committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-09 20:47:47 +0300 |
commit | 3898eed890f660d15d314964f7cbbbada3201e54 (patch) | |
tree | b98a1f40748de91eeb28040c0e6570581d2ee740 /ffmpeg.c | |
parent | 60f75ad2458e3613b99e771be8514ca7165284d0 (diff) |
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 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -672,7 +672,7 @@ static void do_audio_out(AVFormatContext *s, AVPacket pkt; av_init_packet(&pkt); - av_fifo_generic_read(ost->fifo, frame_bytes, NULL, audio_buf); + av_fifo_generic_read(ost->fifo, audio_buf, frame_bytes, NULL); //FIXME pass ost->sync_opts as AVFrame.pts in avcodec_encode_audio() @@ -1452,7 +1452,7 @@ static int output_packet(AVInputStream *ist, int ist_index, if(fifo_bytes > 0 && enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) { int fs_tmp = enc->frame_size; enc->frame_size = fifo_bytes / (2 * enc->channels); - av_fifo_generic_read(ost->fifo, fifo_bytes, NULL, samples); + av_fifo_generic_read(ost->fifo, samples, fifo_bytes, NULL); ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, samples); enc->frame_size = fs_tmp; } |