diff --git a/libavcodec/apv_decode.c b/libavcodec/apv_decode.c
index 43628d2815..8d90a6ab61 100644
--- a/libavcodec/apv_decode.c
+++ b/libavcodec/apv_decode.c
@@ -375,6 +375,7 @@ static int apv_decode(AVCodecContext *avctx, AVFrame *output,
     if (err < 0)
         return err;
 
+    apv->cur_raw_frame = input;
     apv->output_frame = output;
     atomic_store_explicit(&apv->tile_errors, 0, memory_order_relaxed);
 
diff --git a/libavcodec/apv_decode.h b/libavcodec/apv_decode.h
index dee908eebb..dd65f1b948 100644
--- a/libavcodec/apv_decode.h
+++ b/libavcodec/apv_decode.h
@@ -24,6 +24,7 @@
 
 #include "apv.h"
 #include "apv_dsp.h"
+#include "cbs_apv.h"
 
 #include "cbs.h"
 #include "get_bits.h"
@@ -100,6 +101,7 @@ typedef struct APVDecodeContext {
 
     CodedBitstreamFragment au;
     APVDerivedTileInfo tile_info;
+    APVRawFrame *cur_raw_frame;
 
     AVPacket *pkt;
     AVFrame *output_frame;