avcodec/vc1: Avoid superfluous VLC structures

For all VLCs here, the number of bits of the VLC is
write-only, because it is hardcoded at the call site.
Therefore one can replace these VLC structures with
the only thing that is actually used: The pointer
to the VLCElem table. And in some cases one can even
avoid this.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h
index 3b6be78141..0e01458c89 100644
--- a/libavcodec/vc1.h
+++ b/libavcodec/vc1.h
@@ -279,7 +279,7 @@ typedef struct VC1Context{
      */
     uint8_t mvrange;                ///< Extended MV range flag
     uint8_t pquantizer;             ///< Uniform (over sequence) quantizer in use
-    VLC *cbpcy_vlc;                 ///< CBPCY VLC table
+    const VLCElem *cbpcy_vlc;       ///< CBPCY VLC table
     int tt_index;                   ///< Index for Transform Type tables (to decode TTMB)
     uint8_t* mv_type_mb_plane;      ///< bitplane for mv_type == (4MV)
     uint8_t* direct_mb_plane;       ///< bitplane for "direct" MBs
@@ -334,10 +334,10 @@ typedef struct VC1Context{
     int intcomp;
     uint8_t lumscale2;  ///< for interlaced field P picture
     uint8_t lumshift2;
-    VLC* mbmode_vlc;
-    VLC* imv_vlc;
-    VLC* twomvbp_vlc;
-    VLC* fourmvbp_vlc;
+    const VLCElem *mbmode_vlc;
+    const VLCElem *imv_vlc;
+    const VLCElem *twomvbp_vlc;
+    const VLCElem *fourmvbp_vlc;
     uint8_t twomvbp;
     uint8_t fourmvbp;
     uint8_t* fieldtx_plane;