diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c
index 24bc17400e..7bb0978a53 100644
--- a/libavformat/aiffenc.c
+++ b/libavformat/aiffenc.c
@@ -219,7 +219,7 @@ static int aiff_write_packet(AVFormatContext *s, AVPacket *pkt)
             return 0;
 
         return avpriv_packet_list_put(&aiff->pict_list, &aiff->pict_list_end,
-                                  pkt, av_packet_ref, 0);
+                                      pkt, NULL, 0);
     }
 
     return 0;
diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c
index f884e5d2c8..e8f043729e 100644
--- a/libavformat/flacenc.c
+++ b/libavformat/flacenc.c
@@ -360,7 +360,7 @@ static int flac_write_packet(struct AVFormatContext *s, AVPacket *pkt)
     if (pkt->stream_index == c->audio_stream_idx) {
         if (c->waiting_pics) {
             /* buffer audio packets until we get all the pictures */
-            ret = avpriv_packet_list_put(&c->queue, &c->queue_end, pkt, av_packet_ref, 0);
+            ret = avpriv_packet_list_put(&c->queue, &c->queue_end, pkt, NULL, 0);
             if (ret < 0) {
                 av_log(s, AV_LOG_ERROR, "Out of memory in packet queue; skipping attached pictures\n");
                 c->waiting_pics = 0;
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 04cf2f777d..e5391bb80f 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -6187,9 +6187,11 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)
                 return AVERROR(EINVAL);
             }
 
+            /* The following will reset pkt and is only allowed to be used
+             * because we return immediately. afterwards. */
             if ((ret = avpriv_packet_list_put(&trk->squashed_packet_queue,
                                               &trk->squashed_packet_queue_end,
-                                              pkt, av_packet_ref, 0)) < 0) {
+                                              pkt, NULL, 0)) < 0) {
                 return ret;
             }
 
diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index e4b2a65b07..5728ef30be 100644
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -524,7 +524,8 @@ static int mp3_write_packet(AVFormatContext *s, AVPacket *pkt)
     if (pkt->stream_index == mp3->audio_stream_idx) {
         if (mp3->pics_to_write) {
             /* buffer audio packets until we get all the pictures */
-            int ret = avpriv_packet_list_put(&mp3->queue, &mp3->queue_end, pkt, av_packet_ref, 0);
+            int ret = avpriv_packet_list_put(&mp3->queue, &mp3->queue_end,
+                                             pkt, NULL, 0);
 
             if (ret < 0) {
                 av_log(s, AV_LOG_WARNING, "Not enough memory to buffer audio. Skipping picture streams\n");
diff --git a/libavformat/ttaenc.c b/libavformat/ttaenc.c
index 11855c32d9..5f21fdc144 100644
--- a/libavformat/ttaenc.c
+++ b/libavformat/ttaenc.c
@@ -95,10 +95,11 @@ static int tta_write_packet(AVFormatContext *s, AVPacket *pkt)
     int ret;
 
     ret = avpriv_packet_list_put(&tta->queue, &tta->queue_end, pkt,
-                                 av_packet_ref, 0);
+                                 NULL, 0);
     if (ret < 0) {
         return ret;
     }
+    pkt = &tta->queue_end->pkt;
 
     avio_wl32(tta->seek_table, pkt->size);
     tta->nb_samples += pkt->duration;