aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-05-27 01:26:22 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-05-27 01:26:22 +0000
commit1234da4caf5468630e5657bf81cddd51f01a8733 (patch)
tree0f23e2656d73f08989ba858abaf99ad2f5bc780a
parentfbcb0811616d12c8a4dd5ff6db493975f371efab (diff)
downloadffmpeg-1234da4caf5468630e5657bf81cddd51f01a8733.tar.gz
use av_fifo_generic_write, old func is deprecated
Originally committed as revision 13455 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c2
-rw-r--r--libavformat/gxfenc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index ab83b3e8c2..4f82100943 100644
--- a/ffmpeg.c
+++ b/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;
diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c
index e47f45eeb6..588a223f00 100644
--- a/libavformat/gxfenc.c
+++ b/libavformat/gxfenc.c
@@ -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) {