[FFmpeg-devel] [PATCH] avcodec/get_bits: declare VLC table args as const

Leo Izen leo.izen at gmail.com
Sat Jun 11 17:08:20 EEST 2022


Declaring the VLC table as const allows a caller to call get_vlc2()
with a pre-generated static const table without generating warnings
for -Wdiscarded-qualifiers.
---
 libavcodec/get_bits.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
index d4e9276da1..49202b0211 100644
--- a/libavcodec/get_bits.h
+++ b/libavcodec/get_bits.h
@@ -775,7 +775,7 @@ static inline const uint8_t *align_get_bits(GetBitContext *s)
 
 /* Return the LUT element for the given bitstream configuration. */
 static inline int set_idx(GetBitContext *s, int code, int *n, int *nb_bits,
-                          VLC_TYPE (*table)[2])
+                          const VLC_TYPE (*table)[2])
 {
     unsigned idx;
 
@@ -795,7 +795,7 @@ static inline int set_idx(GetBitContext *s, int code, int *n, int *nb_bits,
  *                  = (max_vlc_length + bits - 1) / bits
  * @returns the code parsed or -1 if no vlc matches
  */
-static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2],
+static av_always_inline int get_vlc2(GetBitContext *s, const VLC_TYPE (*table)[2],
                                      int bits, int max_depth)
 {
 #if CACHED_BITSTREAM_READER
-- 
2.36.1



More information about the ffmpeg-devel mailing list