diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-28 01:50:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-28 01:50:36 +0200 |
| commit | 25d8099beb4c7eb93539f9162af1336ef7130fed (patch) | |
| tree | 4f668222da738409baf5ad8a1ee9d1c9f9004f96 /libavcodec/ac3dec.c | |
| parent | 57e2ded4234356c26bf92b0a627ec383ea8d288f (diff) | |
| parent | 991f3de1bb696a55f7604e4b7d53492299fe44b5 (diff) | |
| download | ffmpeg-25d8099beb4c7eb93539f9162af1336ef7130fed.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
ac3enc: Add codec-specific options for writing AC-3 metadata.
NOT MERGED: Remove arrozcru URL from documentation
sndio support for playback and record
Conflicts:
doc/faq.texi
doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3dec.c')
| -rw-r--r-- | libavcodec/ac3dec.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index c4365170f9..b1f09f28b1 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -67,16 +67,6 @@ static const uint8_t quantization_tab[16] = { static float dynamic_range_tab[256]; /** Adjustments in dB gain */ -#define LEVEL_PLUS_3DB 1.4142135623730950 -#define LEVEL_PLUS_1POINT5DB 1.1892071150027209 -#define LEVEL_MINUS_1POINT5DB 0.8408964152537145 -#define LEVEL_MINUS_3DB 0.7071067811865476 -#define LEVEL_MINUS_4POINT5DB 0.5946035575013605 -#define LEVEL_MINUS_6DB 0.5000000000000000 -#define LEVEL_MINUS_9DB 0.3535533905932738 -#define LEVEL_ZERO 0.0000000000000000 -#define LEVEL_ONE 1.0000000000000000 - static const float gain_levels[9] = { LEVEL_PLUS_3DB, LEVEL_PLUS_1POINT5DB, |