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) {