[FFmpeg-devel] [PATCH 08/19] avcodec/vc1data: Remove duplicate defines

[Andreas Rheinhardt]

The defines in vc1data.c are duplicates of the ones in vc1data.h;
they are also pointless, because they are not used anywhere.

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

diff --git a/libavcodec/vc1data.c b/libavcodec/vc1data.c
index 01a9767d51..004b1347d4 100644
--- a/libavcodec/vc1data.c
+++ b/libavcodec/vc1data.c
@@ -98,50 +98,31 @@ const uint8_t ff_vc1_pquant_table[3][32] = {
       14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 29, 31 }
 };
 
-/** @name VC-1 VLC tables and defines
+/** @name VC-1 VLC tables
  *  @todo TODO move this into the context
  */
 //@{
-#define VC1_IMODE_VLC_BITS 4
 VLC ff_vc1_imode_vlc;
-#define VC1_NORM2_VLC_BITS 3
 VLC ff_vc1_norm2_vlc;
-#define VC1_NORM6_VLC_BITS 9
 VLC ff_vc1_norm6_vlc;
 /* Could be optimized, one table only needs 8 bits */
-#define VC1_TTMB_VLC_BITS 9 //12
 VLC ff_vc1_ttmb_vlc[3];
-#define VC1_MV_DIFF_VLC_BITS 9 //15
 VLC ff_vc1_mv_diff_vlc[4];
-#define VC1_CBPCY_P_VLC_BITS 9 //14
 VLC ff_vc1_cbpcy_p_vlc[4];
-#define VC1_ICBPCY_VLC_BITS 9
 VLC ff_vc1_icbpcy_vlc[8];
-#define VC1_4MV_BLOCK_PATTERN_VLC_BITS 6
 VLC ff_vc1_4mv_block_pattern_vlc[4];
-#define VC1_2MV_BLOCK_PATTERN_VLC_BITS 3
 VLC ff_vc1_2mv_block_pattern_vlc[4];
-#define VC1_TTBLK_VLC_BITS 5
 VLC ff_vc1_ttblk_vlc[3];
-#define VC1_SUBBLKPAT_VLC_BITS 6
 VLC ff_vc1_subblkpat_vlc[3];
-#define VC1_INTFR_4MV_MBMODE_VLC_BITS 9
 VLC ff_vc1_intfr_4mv_mbmode_vlc[4];
-#define VC1_INTFR_NON4MV_MBMODE_VLC_BITS 6
 VLC ff_vc1_intfr_non4mv_mbmode_vlc[4];
-#define VC1_IF_MMV_MBMODE_VLC_BITS 5
 VLC ff_vc1_if_mmv_mbmode_vlc[8];
-#define VC1_IF_1MV_MBMODE_VLC_BITS 5
 VLC ff_vc1_if_1mv_mbmode_vlc[8];
-#define VC1_1REF_MVDATA_VLC_BITS 9
 VLC ff_vc1_1ref_mvdata_vlc[4];
-#define VC1_2REF_MVDATA_VLC_BITS 9
 VLC ff_vc1_2ref_mvdata_vlc[8];
 
 VLC ff_vc1_ac_coeff_table[8];
 
-#define VC1_IF_MBMODE_VLC_BITS 5    // as a placeholder for VC1_IF_MMV_MBMODE_VLC_BITS
-                                    // or VC1_IF_1MV_MBMODE_VLC_BITS since they are the same
 //@}
 
 
diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h
index 3e45ef1e79..ee4ec83263 100644
--- a/libavcodec/vc1data.h
+++ b/libavcodec/vc1data.h
@@ -91,7 +91,8 @@ extern VLC ff_vc1_2ref_mvdata_vlc[8];
 
 extern VLC ff_vc1_ac_coeff_table[8];
 
-#define VC1_IF_MBMODE_VLC_BITS 5
+#define VC1_IF_MBMODE_VLC_BITS 5    // as a placeholder for VC1_IF_MMV_MBMODE_VLC_BITS
+                                    // or VC1_IF_1MV_MBMODE_VLC_BITS since they are the same
 //@}
 
 #define B_FRACTION_DEN  256
-- 
2.34.1