lavc: Mark hw_config pointer arrays as const

They are read-only just like the HWConfig structures they point to.

diff --git a/libavcodec/codec.h b/libavcodec/codec.h
index dc8e12b3f03c06f153cdfec4b3399b3c70938a2a..0ccbf0eb19f59a2382e44eac0768be8be2d8cf06 100644 (file)
--- a/libavcodec/codec.h
+++ b/libavcodec/codec.h
@@ -320,7 +320,7 @@ typedef struct AVCodec {
      *
      * The user can only access this field via avcodec_get_hw_config().
      */
-    const struct AVCodecHWConfigInternal **hw_configs;
+    const struct AVCodecHWConfigInternal *const *hw_configs;
 
     /**
      * List of supported codec_tags, terminated by FF_CODEC_TAGS_END.

diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c
index ee2ecc01fe4a10b23638f244cd0fd3d277dea353..5e698d4cd045b9056647eceb6e4da000bac1e057 100644 (file)
--- a/libavcodec/cuviddec.c
+++ b/libavcodec/cuviddec.c
@@ -1100,7 +1100,7 @@ static const AVOption options[] = {
     { NULL }
 };
 
-static const AVCodecHWConfigInternal *cuvid_hw_configs[] = {
+static const AVCodecHWConfigInternal *const cuvid_hw_configs[] = {
     &(const AVCodecHWConfigInternal) {
         .public = {
             .pix_fmt     = AV_PIX_FMT_CUDA,

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 3b29a189e9d508fa09dabe285c90c67ffb3baa09..32e26a57de7823fbef1f280727ea0e8d244f1c75 100644 (file)
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -743,7 +743,7 @@ const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = {
     AV_PIX_FMT_NONE
 };
 
-const AVCodecHWConfigInternal *ff_h263_hw_config_list[] = {
+const AVCodecHWConfigInternal *const ff_h263_hw_config_list[] = {
 #if CONFIG_H263_VAAPI_HWACCEL
     HWACCEL_VAAPI(h263),
 #endif

diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c
index 25410021e83695492105fd1eedcce80fe610ea17..ac1725e4660cc5b7db0d7b1aaf9f0c0365305ffa 100644 (file)
--- a/libavcodec/mediacodecdec.c
+++ b/libavcodec/mediacodecdec.c
@@ -486,7 +486,7 @@ static void mediacodec_decode_flush(AVCodecContext *avctx)
     ff_mediacodec_dec_flush(avctx, s->ctx);
 }
 
-static const AVCodecHWConfigInternal *mediacodec_hw_configs[] = {
+static const AVCodecHWConfigInternal *const mediacodec_hw_configs[] = {
     &(const AVCodecHWConfigInternal) {
         .public          = {
             .pix_fmt     = AV_PIX_FMT_MEDIACODEC,

diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c
index cd2b263a98472520cda0cf331dca790c2d5e4230..172fb61c9b4a456b6b753e36d4dbafb811bef241 100644 (file)
--- a/libavcodec/mmaldec.c
+++ b/libavcodec/mmaldec.c
@@ -809,7 +809,7 @@ static int ffmmal_decode(AVCodecContext *avctx, void *data, int *got_frame,
     return ret;
 }
 
-static const AVCodecHWConfigInternal *mmal_hw_configs[] = {
+static const AVCodecHWConfigInternal *const mmal_hw_configs[] = {
     HW_CONFIG_INTERNAL(MMAL),
     NULL
 };

diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index 48625f5baa6ab28d61091e6ce4e98aa2e76b98b2..1c06b6af2706779db71256a7391c4a065e970b6d 100644 (file)
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -59,7 +59,7 @@ const enum AVPixelFormat ff_nvenc_pix_fmts[] = {
     AV_PIX_FMT_NONE
 };
 
-const AVCodecHWConfigInternal *ff_nvenc_hw_configs[] = {
+const AVCodecHWConfigInternal *const ff_nvenc_hw_configs[] = {
     HW_CONFIG_ENCODER_FRAMES(CUDA,  CUDA),
     HW_CONFIG_ENCODER_DEVICE(NONE,  CUDA),
 #if CONFIG_D3D11VA

diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h
index f6f2a6361ab83f72fee8ea3628639f11fd4f3cf6..fefc5f7f0bac83efc280984ae8d6cf0cbef47d8e 100644 (file)
--- a/libavcodec/nvenc.h
+++ b/libavcodec/nvenc.h
@@ -230,6 +230,6 @@ int ff_nvenc_receive_packet(AVCodecContext *avctx, AVPacket *pkt);
 void ff_nvenc_encode_flush(AVCodecContext *avctx);
 
 extern const enum AVPixelFormat ff_nvenc_pix_fmts[];
-extern const AVCodecHWConfigInternal *ff_nvenc_hw_configs[];
+extern const AVCodecHWConfigInternal *const ff_nvenc_hw_configs[];
 
 #endif /* AVCODEC_NVENC_H */

diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index fc25dc73e577d702d5df82bb22d3a4bd841f1749..c666aaeb52e2821c9ec306b24e6f49bcd5d7130d 100644 (file)
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -43,7 +43,7 @@
 #include "qsv_internal.h"
 #include "qsvdec.h"
 
-const AVCodecHWConfigInternal *ff_qsv_hw_configs[] = {
+const AVCodecHWConfigInternal *const ff_qsv_hw_configs[] = {
     &(const AVCodecHWConfigInternal) {
         .public = {
             .pix_fmt     = AV_PIX_FMT_QSV,

diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h
index cb948f516d1e25e559d60cde9649fb1da5772578..f3b7344cbaa2e2e52bfb56c85a18ddc3bb4f6070 100644 (file)
--- a/libavcodec/qsvdec.h
+++ b/libavcodec/qsvdec.h
@@ -74,7 +74,7 @@ typedef struct QSVContext {
     int         nb_ext_buffers;
 } QSVContext;
 
-extern const AVCodecHWConfigInternal *ff_qsv_hw_configs[];
+extern const AVCodecHWConfigInternal *const ff_qsv_hw_configs[];
 
 int ff_qsv_process_data(AVCodecContext *avctx, QSVContext *q,
                         AVFrame *frame, int *got_frame, AVPacket *pkt);

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 1ed8f5d9734e1c5b9317e6408c36760623f71dcd..2bd2a56227b4838fb481da42d60d106e640e5954 100644 (file)
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -1655,7 +1655,7 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q)
     return 0;
 }
 
-const AVCodecHWConfigInternal *ff_qsv_enc_hw_configs[] = {
+const AVCodecHWConfigInternal *const ff_qsv_enc_hw_configs[] = {
     HW_CONFIG_ENCODER_FRAMES(QSV,  QSV),
     HW_CONFIG_ENCODER_DEVICE(NV12, QSV),
     HW_CONFIG_ENCODER_DEVICE(P010, QSV),

diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
index 4f579d1db1475f4cf753ab57370bc1947a843b4f..6d305f87ddbee5dd67f58e93feeec0c1e095ad61 100644 (file)
--- a/libavcodec/qsvenc.h
+++ b/libavcodec/qsvenc.h
@@ -98,7 +98,7 @@
 { "forced_idr",     "Forcing I frames as IDR frames",         OFFSET(qsv.forced_idr),     AV_OPT_TYPE_BOOL,{ .i64 = 0  },  0,          1, VE },                         \
 { "low_power", "enable low power mode(experimental: many limitations by mfx version, BRC modes, etc.)", OFFSET(qsv.low_power), AV_OPT_TYPE_BOOL, { .i64 = 0}, 0, 1, VE},\
 
-extern const AVCodecHWConfigInternal *ff_qsv_enc_hw_configs[];
+extern const AVCodecHWConfigInternal *const ff_qsv_enc_hw_configs[];
 
 typedef int SetEncodeCtrlCB (AVCodecContext *avctx,
                              const AVFrame *frame, mfxEncodeCtrl* enc_ctrl);

diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c
index 248020d5d6170b2eb824ed5aaf6a3f3aa6228b98..a60962dc86bda448f8a1a101765ae86cf29e2dc4 100644 (file)
--- a/libavcodec/rkmppdec.c
+++ b/libavcodec/rkmppdec.c
@@ -548,7 +548,7 @@ static void rkmpp_flush(AVCodecContext *avctx)
         av_log(avctx, AV_LOG_ERROR, "Failed to reset MPI (code = %d)\n", ret);
 }
 
-static const AVCodecHWConfigInternal *rkmpp_hw_configs[] = {
+static const AVCodecHWConfigInternal *const rkmpp_hw_configs[] = {
     HW_CONFIG_INTERNAL(DRM_PRIME),
     NULL
 };

diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
index b3a02459f1a056f2d16bdc50e4c618b05cf82ad3..518e5b2c00f8ff603d7d46c57e2c89f34bef9ca9 100644 (file)
--- a/libavcodec/vaapi_encode.c
+++ b/libavcodec/vaapi_encode.c
@@ -28,7 +28,7 @@
 #include "encode.h"
 #include "avcodec.h"
 
-const AVCodecHWConfigInternal *ff_vaapi_encode_hw_configs[] = {
+const AVCodecHWConfigInternal *const ff_vaapi_encode_hw_configs[] = {
     HW_CONFIG_ENCODER_FRAMES(VAAPI, VAAPI),
     NULL,
 };

diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h
index aa2a45bca6c3db5c859a1fa17119535bbfbbdffb..b41604a883292c82416d071590259b29921a49b5 100644 (file)
--- a/libavcodec/vaapi_encode.h
+++ b/libavcodec/vaapi_encode.h
@@ -49,7 +49,7 @@ enum {
     MAX_TILE_COLS          = 20,
 };
 
-extern const AVCodecHWConfigInternal *ff_vaapi_encode_hw_configs[];
+extern const AVCodecHWConfigInternal *const ff_vaapi_encode_hw_configs[];
 
 enum {
     PICTURE_TYPE_IDR = 0,