diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-06-13 23:02:57 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-06-17 16:47:29 +0200 |
| commit | 2d764069be3b4092dc986467660607d922023332 (patch) | |
| tree | 1504ef9e286b8df559635e97d31ebe767a9e6426 /libavcodec/dcahuff.c | |
| parent | 97141ffeec803c448d81ee4a53cfa2355f79f7ec (diff) | |
| download | ffmpeg-2d764069be3b4092dc986467660607d922023332.tar.gz | |
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>
Diffstat (limited to 'libavcodec/dcahuff.c')
| -rw-r--r-- | libavcodec/dcahuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dcahuff.c b/libavcodec/dcahuff.c index fa36735c0b..8d5541f9d0 100644 --- a/libavcodec/dcahuff.c +++ b/libavcodec/dcahuff.c @@ -1264,7 +1264,7 @@ VLC ff_dca_vlc_rsd; av_cold void ff_dca_init_vlcs(void) { - static VLC_TYPE dca_table[30214][2]; + static VLCElem dca_table[30214]; int i, j, k = 0; #define DCA_INIT_VLC(vlc, a, b, c, d) \ |