diff --git a/libavcodec/options.c b/libavcodec/options.c
index 44f3e904bf..7f9fb07fd6 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -170,6 +170,9 @@ void avcodec_free_context(AVCodecContext **pavctx)
 
     av_freep(&avctx->extradata);
     av_freep(&avctx->subtitle_header);
+    av_freep(&avctx->intra_matrix);
+    av_freep(&avctx->inter_matrix);
+    av_freep(&avctx->rc_override);
 
     av_freep(pavctx);
 }