diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 21:01:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 21:01:54 +0200 |
| commit | 3ff5ca89fc8783cabed56887f556bdd83279ffb0 (patch) | |
| tree | 3322eaebe79c1d15bf7fc142628ccc42b51dafc2 /libavcodec/x86 | |
| parent | 42196083fe6336095d113f2e2da80fe6660519c7 (diff) | |
| parent | 1f156af4274dc72d588620f6bedb4e9e66023c92 (diff) | |
| download | ffmpeg-3ff5ca89fc8783cabed56887f556bdd83279ffb0.tar.gz | |
Merge commit '1f156af4274dc72d588620f6bedb4e9e66023c92'
* commit '1f156af4274dc72d588620f6bedb4e9e66023c92':
x86: xvid_idct: Drop unused definitions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/idct_mmx_xvid.c | 17 | ||||
| -rw-r--r-- | libavcodec/x86/idct_sse2_xvid.c | 3 |
2 files changed, 0 insertions, 20 deletions
diff --git a/libavcodec/x86/idct_mmx_xvid.c b/libavcodec/x86/idct_mmx_xvid.c index 289120d3fa..ecb6dc4659 100644 --- a/libavcodec/x86/idct_mmx_xvid.c +++ b/libavcodec/x86/idct_mmx_xvid.c @@ -49,23 +49,6 @@ #if HAVE_MMX_INLINE -//============================================================================= -// Macros and other preprocessor constants -//============================================================================= - -#define BITS_INV_ACC 5 // 4 or 5 for IEEE -#define SHIFT_INV_ROW (16 - BITS_INV_ACC) //11 -#define SHIFT_INV_COL (1 + BITS_INV_ACC) //6 -#define RND_INV_ROW (1024 * (6 - BITS_INV_ACC)) -#define RND_INV_COL (16 * (BITS_INV_ACC - 3)) -#define RND_INV_CORR (RND_INV_COL - 1) - -#define BITS_FRW_ACC 3 // 2 or 3 for accuracy -#define SHIFT_FRW_COL BITS_FRW_ACC -#define SHIFT_FRW_ROW (BITS_FRW_ACC + 17) -#define RND_FRW_ROW (262144*(BITS_FRW_ACC - 1)) - - //----------------------------------------------------------------------------- // Various memory constants (trigonometric values or rounding values) //----------------------------------------------------------------------------- diff --git a/libavcodec/x86/idct_sse2_xvid.c b/libavcodec/x86/idct_sse2_xvid.c index 3af2ebbea3..f3f4d38994 100644 --- a/libavcodec/x86/idct_sse2_xvid.c +++ b/libavcodec/x86/idct_sse2_xvid.c @@ -52,9 +52,6 @@ #define X8(x) x,x,x,x,x,x,x,x -#define ROW_SHIFT 11 -#define COL_SHIFT 6 - DECLARE_ASM_CONST(16, int16_t, tan1)[] = {X8(13036)}; // tan( pi/16) DECLARE_ASM_CONST(16, int16_t, tan2)[] = {X8(27146)}; // tan(2pi/16) = sqrt(2)-1 DECLARE_ASM_CONST(16, int16_t, tan3)[] = {X8(43790)}; // tan(3pi/16)-1 |