summaryrefslogtreecommitdiff
path: root/libavcodec/vc1data.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-10-30 03:19:14 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-11-06 17:41:25 +0100
commit6f1403712d7ce4c3256481d6d9bd0853cb5f7d45 (patch)
treeacea36efd2cfb2f60993e613032622a14ca2162a /libavcodec/vc1data.c
parent777a8c2d500c3423a3a55b57752b18e88e876a2f (diff)
downloadffmpeg-6f1403712d7ce4c3256481d6d9bd0853cb5f7d45.tar.gz
avcodec/vc1data: Remove duplicate defines
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@outlook.com>
Diffstat (limited to 'libavcodec/vc1data.c')
-rw-r--r--libavcodec/vc1data.c21
1 files changed, 1 insertions, 20 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
//@}