diff --git a/libavcodec/liboapvenc.c b/libavcodec/liboapvenc.c
index 51b4343c05..22a8ac4890 100644
--- a/libavcodec/liboapvenc.c
+++ b/libavcodec/liboapvenc.c
@@ -628,12 +628,9 @@ static av_cold int liboapve_close(AVCodecContext *avctx)
     ApvEncContext *apv = avctx->priv_data;
 
     for (unsigned int i = 0; i < apv->nb_payloads; i++) {
-        if (apv->payloads[i].data) {
-            av_free(apv->payloads[i].data);
-            apv->payloads[i].data = NULL;
-        }
+        av_freep(&apv->payloads[i].data);
     }
-    av_free(apv->payloads);
+    av_freep(&apv->payloads);
 
     for (int i = 0; i < apv->ifrms.num_frms; i++) {
         if (apv->ifrms.frm[i].imgb != NULL)