opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-19 21:40:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reorder arguments for av_fifo_generic_read to be more logical and

Browse Source 
consistent with av_fifo_generic_write.

Originally committed as revision 17914 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger
2009-03-09 17:47:47 +00:00
parent 60f75ad245
commit 3898eed890
7 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg.c
View File

@ -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;
}