diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
index 8aa248e6cd..12d22bdd7b 100644
--- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c
@@ -179,6 +179,8 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
             return res;

         if (pkt.size) {
+            AVBufferRef *reordered_opaque;
+
             res = dav1d_data_wrap(data, pkt.data, pkt.size, libdav1d_data_free, pkt.buf);
             if (res < 0) {
                 av_packet_unref(&pkt);
@@ -191,6 +193,22 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)

             pkt.buf = NULL;
             av_packet_unref(&pkt);
+            if (c->reordered_opaque && c->reordered_opaque != AV_NOPTS_VALUE) {
+                reordered_opaque = av_buffer_alloc(sizeof(c->reordered_opaque));
+                if (!reordered_opaque) {
+                    dav1d_data_unref(data);
+                    return AVERROR(ENOMEM);
+                }
+
+                *reordered_opaque->data = c->reordered_opaque;
+                res = dav1d_data_wrap_user_data(data, reordered_opaque->data,
+                                                libdav1d_data_free, reordered_opaque);
+                if (res < 0) {
+                    av_buffer_unref(&reordered_opaque);
+                    dav1d_data_unref(data);
+                    return res;
+                }
+            }
         }
     }

@@ -260,7 +278,8 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
     else
         frame->format = c->pix_fmt = pix_fmt[p->p.layout][p->seq_hdr->hbd];

-    frame->reordered_opaque = c->reordered_opaque;
+    if (p->m.user_data.data)
+        frame->reordered_opaque = (int64_t)*p->m.user_data.data;

     // match timestamps and packet size
     frame->pts = frame->best_effort_timestamp = p->m.timestamp;