diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
index d507becc41..a20670be13 100644
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -182,9 +182,9 @@ static void fill_slice_short(DXVA_Slice_H264_Short *slice,
 static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice,
                             unsigned position, unsigned size)
 {
-    H264Context *h = avctx->priv_data; /* FIXME Can't use const because of get_bits_count */
+    const H264Context *h = avctx->priv_data;
     struct dxva_context *ctx = avctx->hwaccel_context;
-    MpegEncContext *s = &h->s;
+    const MpegEncContext *s = &h->s;
     unsigned list;
 
     memset(slice, 0, sizeof(*slice));
@@ -260,8 +260,8 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
                                              DXVA2_DecodeBufferDesc *bs,
                                              DXVA2_DecodeBufferDesc *sc)
 {
-    H264Context *h = avctx->priv_data;
-    MpegEncContext *s = &h->s;
+    const H264Context *h = avctx->priv_data;
+    const MpegEncContext *s = &h->s;
     const unsigned mb_count = s->mb_width * s->mb_height;
     struct dxva_context *ctx = avctx->hwaccel_context;
     const Picture *current_picture = h->s.current_picture_ptr;
@@ -381,7 +381,7 @@ static int start_frame(AVCodecContext *avctx,
 static int decode_slice(AVCodecContext *avctx,
                         const uint8_t *buffer, uint32_t size)
 {
-    H264Context *h = avctx->priv_data; /* FIXME Can't use const because of get_bits_count */
+    const H264Context *h = avctx->priv_data;
     struct dxva_context *ctx = avctx->hwaccel_context;
     const Picture *current_picture = h->s.current_picture_ptr;
     struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private;