[FFmpeg-devel] [PATCH 25/61] avcodec/rv34: Constify pointer to static object

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Wed Sep 27 01:16:56 EEST 2023


Said object is only allowed to be modified during its
initialization and is immutable afterwards.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 libavcodec/rv34.c | 5 +++--
 libavcodec/rv34.h | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index a7bc8efd8e..3e065d14b1 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -186,7 +186,7 @@ static av_cold void rv34_init_tables(void)
 /**
  * Decode coded block pattern.
  */
-static int rv34_decode_cbp(GetBitContext *gb, RV34VLC *vlc, int table)
+static int rv34_decode_cbp(GetBitContext *gb, const RV34VLC *vlc, int table)
 {
     int pattern, code, cbp=0;
     int ones;
@@ -289,7 +289,8 @@ static inline void decode_subblock3(int16_t *dst, int code, GetBitContext *gb,
  *  o--o
  */
 
-static int rv34_decode_block(int16_t *dst, GetBitContext *gb, RV34VLC *rvlc, int fc, int sc, int q_dc, int q_ac1, int q_ac2)
+static int rv34_decode_block(int16_t *dst, GetBitContext *gb, const RV34VLC *rvlc,
+                             int fc, int sc, int q_dc, int q_ac1, int q_ac2)
 {
     int code, pattern, has_ac = 1;
 
diff --git a/libavcodec/rv34.h b/libavcodec/rv34.h
index 4bb81b4965..6fe1f8087d 100644
--- a/libavcodec/rv34.h
+++ b/libavcodec/rv34.h
@@ -92,7 +92,7 @@ typedef struct RV34DecContext{
     const uint8_t *luma_dc_quant_i;///< luma subblock DC quantizer for intraframes
     const uint8_t *luma_dc_quant_p;///< luma subblock DC quantizer for interframes
 
-    RV34VLC *cur_vlcs;       ///< VLC set used for current frame decoding
+    const RV34VLC *cur_vlcs; ///< VLC set used for current frame decoding
     H264PredContext h;       ///< functions for 4x4 and 16x16 intra block prediction
     SliceInfo si;            ///< current slice information
 
-- 
2.34.1



More information about the ffmpeg-devel mailing list