diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 7b4e1b4216..cbc6f70a79 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -791,7 +791,7 @@ typedef struct AVCodecContext {
      * information on struct for av_log
      * - set by avcodec_alloc_context
      */
-    AVClass *av_class;
+    const AVClass *av_class;
     /**
      * the average bitrate
      * - encoding: Set by user; unused for constant quantizer encoding.
diff --git a/libavcodec/imgresample.c b/libavcodec/imgresample.c
index b5c57ffd94..5b720b2326 100644
--- a/libavcodec/imgresample.c
+++ b/libavcodec/imgresample.c
@@ -48,7 +48,7 @@
 #define LINE_BUF_HEIGHT (NB_TAPS * 4)
 
 struct SwsContext {
-    AVClass *av_class;
+    const AVClass *av_class;
     struct ImgReSampleContext *resampling_ctx;
     enum PixelFormat src_pix_fmt, dst_pix_fmt;
 };
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 4aaedb11c5..6418776496 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -768,7 +768,7 @@ static const AVOption options[]={
 #undef D
 #undef DEFAULT
 
-static AVClass av_codec_context_class = { "AVCodecContext", context_to_name, options };
+static const AVClass av_codec_context_class = { "AVCodecContext", context_to_name, options };
 
 void avcodec_get_context_defaults2(AVCodecContext *s, enum CodecType codec_type){
     int flags=0;
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 1a2aa0f357..ab3214825a 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -392,7 +392,7 @@ typedef struct
 /** An instance of a filter */
 struct AVFilterContext
 {
-    AVClass *av_class;              ///< needed for av_log()
+    const AVClass *av_class;              ///< needed for av_log()
 
     AVFilter *filter;               ///< the AVFilter of which this is an instance