mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-12 02:19:35 +00:00
use av_fifo_generic_write, old func is deprecated
Originally committed as revision 13455 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
fbcb081161
commit
1234da4caf
2
ffmpeg.c
2
ffmpeg.c
@ -588,7 +588,7 @@ static void do_audio_out(AVFormatContext *s,
|
||||
if (enc->frame_size > 1) {
|
||||
/* output resampled raw samples */
|
||||
av_fifo_realloc(&ost->fifo, av_fifo_size(&ost->fifo) + size_out);
|
||||
av_fifo_write(&ost->fifo, buftmp, size_out);
|
||||
av_fifo_generic_write(&ost->fifo, buftmp, size_out, NULL);
|
||||
|
||||
frame_bytes = enc->frame_size * 2 * enc->channels;
|
||||
|
||||
|
@ -793,7 +793,7 @@ static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pk
|
||||
GXFStreamContext *sc = &gxf->streams[i];
|
||||
if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
|
||||
if (pkt && pkt->stream_index == i) {
|
||||
av_fifo_write(&sc->audio_buffer, pkt->data, pkt->size);
|
||||
av_fifo_generic_write(&sc->audio_buffer, pkt->data, pkt->size, NULL);
|
||||
pkt = NULL;
|
||||
}
|
||||
if (flush || av_fifo_size(&sc->audio_buffer) >= GXF_AUDIO_PACKET_SIZE) {
|
||||
|
Loading…
Reference in New Issue
Block a user