avcodec/vlc: Use structure instead of VLC_TYPE array as VLC element

In C, qualifiers for arrays are broken:
const VLC_TYPE (*foo)[2] is a pointer to an array of two const VLC_TYPE
elements and unfortunately this is not compatible with a pointer
to a const array of two VLC_TYPE, because the latter does not exist
as array types are never qualified (the qualifier applies to the base
type instead). This is the reason why get_vlc2() doesn't accept
a const VLC table despite not modifying the table at all, as
there is no automatic conversion from VLC_TYPE (*)[2] to
const VLC_TYPE (*)[2].

Fix this by using a structure VLCElem for the VLC table.
This also has the advantage of making it clear which
element is which.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index 0bd0db29c4..73b8aeea78 100644
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -52,7 +52,7 @@ static VLC j_orient_vlc[2][4]; // [quant], [select]
 static av_cold void x8_init_vlc(VLC *vlc, int nb_bits, int nb_codes,
                                 int *offset, const uint8_t table[][2])
 {
-    static VLC_TYPE vlc_buf[VLC_BUFFER_SIZE][2];
+    static VLCElem vlc_buf[VLC_BUFFER_SIZE];
 
     vlc->table           = &vlc_buf[*offset];
     vlc->table_allocated = VLC_BUFFER_SIZE - *offset;