Mercurial > libavformat.hg

comparison audiointerleave.c @ 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 b1feed18d106
children 536e5527c1e0
comparison
equal deleted inserted replaced
4688:0905585d48fd 4689:fc0a165de804
78 int size = FFMIN(av_fifo_size(aic->fifo), *aic->samples * aic->sample_size); 78 int size = FFMIN(av_fifo_size(aic->fifo), *aic->samples * aic->sample_size);
79 if (!size || (!flush && size == av_fifo_size(aic->fifo))) 79 if (!size || (!flush && size == av_fifo_size(aic->fifo)))
80 return 0; 80 return 0;
81 81
82 av_new_packet(pkt, size); 82 av_new_packet(pkt, size);
83 av_fifo_generic_read(aic->fifo, size, NULL, pkt->data); 83 av_fifo_generic_read(aic->fifo, pkt->data, size, NULL);
84 84
85 pkt->dts = pkt->pts = aic->dts; 85 pkt->dts = pkt->pts = aic->dts;
86 pkt->duration = av_rescale_q(*aic->samples, st->time_base, aic->time_base); 86 pkt->duration = av_rescale_q(*aic->samples, st->time_base, aic->time_base);
87 pkt->stream_index = stream_index; 87 pkt->stream_index = stream_index;
88 aic->dts += pkt->duration; 88 aic->dts += pkt->duration;