diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-09 19:50:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-11 14:56:20 +0100 |
| commit | 2800e8d62e4c6cdd8a7e218cb15a10f216946f18 (patch) | |
| tree | 5f6ff986bb1e4fc994121690e0ef5ae6b0701aac | |
| parent | 5126a8ecbbb6981ac29f437f1d35f5248c8f234d (diff) | |
| download | ffmpeg-2800e8d62e4c6cdd8a7e218cb15a10f216946f18.tar.gz | |
Revert "ac3enc: use MUL64() to multiply fixed-point coefficients"
Author says, this is unneeded.
This reverts commit 67fc32ac6197a7fe265795d0bf60bf704464394e.
| -rw-r--r-- | libavcodec/ac3enc.c | 8 | ||||
| -rw-r--r-- | libavcodec/ac3enc_fixed.h | 2 | ||||
| -rw-r--r-- | libavcodec/ac3enc_float.h | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 4fc81062a1..863f2002e0 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -328,10 +328,10 @@ static void compute_rematrixing_strategy(AC3EncodeContext *s) CoefType rt = block->mdct_coef[1][i]; CoefType md = lt + rt; CoefType sd = lt - rt; - sum[0] += MUL_COEF(lt, lt); - sum[1] += MUL_COEF(rt, rt); - sum[2] += MUL_COEF(md, md); - sum[3] += MUL_COEF(sd, sd); + sum[0] += lt * lt; + sum[1] += rt * rt; + sum[2] += md * md; + sum[3] += sd * sd; } /* compare sums to determine if rematrixing will be used for this band */ diff --git a/libavcodec/ac3enc_fixed.h b/libavcodec/ac3enc_fixed.h index 773caec2c3..12c8ace4aa 100644 --- a/libavcodec/ac3enc_fixed.h +++ b/libavcodec/ac3enc_fixed.h @@ -36,8 +36,6 @@ typedef int16_t SampleType; typedef int32_t CoefType; typedef int64_t CoefSumType; -#define MUL_COEF(a,b) MUL64(a,b) - /** * Compex number. diff --git a/libavcodec/ac3enc_float.h b/libavcodec/ac3enc_float.h index 6ad22ecc0b..1726ca045f 100644 --- a/libavcodec/ac3enc_float.h +++ b/libavcodec/ac3enc_float.h @@ -36,8 +36,6 @@ typedef float SampleType; typedef float CoefType; typedef float CoefSumType; -#define MUL_COEF(a,b) ((a)*(b)) - typedef struct AC3MDCTContext { const float *window; ///< MDCT window function |