diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index 21b350110e..a527ab3f83 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -516,11 +516,11 @@ static int ogg_write_trailer(AVFormatContext *s)
         OGGStreamContext *oggstream = st->priv_data;
         if (st->codec->codec_id == CODEC_ID_FLAC ||
             st->codec->codec_id == CODEC_ID_SPEEX) {
-            av_free(oggstream->header[0]);
-            av_free(oggstream->header[1]);
+            av_freep(&oggstream->header[0]);
+            av_freep(&oggstream->header[1]);
         }
         else
-            av_free(oggstream->header[1]);
+            av_freep(&oggstream->header[1]);
         av_freep(&st->priv_data);
     }
     return 0;