diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-28 04:23:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-28 04:26:01 +0200 |
| commit | 0665199e438fcdd2000717352fc665a8cf017f7c (patch) | |
| tree | 41e6d53948b16b9b1c82900da0d28c61efab9333 /libavcodec/aacdectab.h | |
| parent | e5d80c7b2d893422e2e60a97e08bfc48ca1684e6 (diff) | |
| parent | b239526873dc81f9b66796ad4d9fe1cb93ec34d3 (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
vorbisdec: Rename silly "class_" variable to plain "class".
simple_idct_alpha: Drop some useless casts.
Simplify av_log_missing_feature().
ac3enc: remove check for mismatching channels and channel_layout
If AVCodecContext.channels is 0 and AVCodecContext.channel_layout is non-zero, set channels based on channel_layout.
If AVCodecContext.channel_layout and AVCodecContext.channels are both non-zero, check to make sure they do not contradict eachother.
cosmetics: indentation
Check AVCodec.supported_samplerates and AVCodec.channel_layouts in avcodec_open().
aacdec: remove sf_scale and sf_offset.
aacdec: use a scale of 2 in the LTP MDCT rather than doubling the coefficient table values from the spec.
Define POW_SF2_ZERO in aac.h and use for ff_aac_pow2sf_tabp[] offsets instead of hardcoding 200 everywhere.
Large intensity stereo and PNS indices are legal. Clip them instead of erroring out. A magnitude of 100 corresponds to 2^25 so the will most likely result in clipped output anyway.
qpeg: use reget_buffer() in decode_frame()
ultimotion: use reget_buffer() in ulti_decode_frame()
smacker: remove unnecessary call to avctx->release_buffer in decode_frame()
avparser: don't av_malloc(0).
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdectab.h')
| -rw-r--r-- | libavcodec/aacdectab.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h index 0bccb84cb7..22ae00ff32 100644 --- a/libavcodec/aacdectab.h +++ b/libavcodec/aacdectab.h @@ -36,11 +36,11 @@ #include <stdint.h> /* @name ltp_coef - * Table of the LTP coefficient (multiplied by 2) + * Table of the LTP coefficients */ static const float ltp_coef[8] = { - 1.141658, 1.393232, 1.626008, 1.822608, - 1.969800, 2.135788, 2.2389202, 2.739066, + 0.570829, 0.696616, 0.813004, 0.911304, + 0.984900, 1.067894, 1.194601, 1.369533, }; /* @name tns_tmp2_map |