diff options
| author | Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> | 2015-03-13 22:28:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-14 04:27:06 +0100 |
| commit | 7b05b5093ea67a3397b0c37cf398bab471e1ce2b (patch) | |
| tree | 953130f4daa85a7bf2e93a2aa1c3ff0d098ff632 /libavcodec/ac3dec_fixed.c | |
| parent | e16592c42e877ab93a9a719ca69df22c2a487a98 (diff) | |
ac3dec_fixed: always use the USE_FIXED=1 variant of the AC3DecodeContext
The AC3DecodeContext has a float (USE_FIXED=0) and an integer
(USE_FIXED=1) variant, both of which can be present in the same binary.
This is not only very confusing, but it also breaks horribly, when one
variant is used by code expecting the other.
This currently happens, because eac3dec.c is only compiled for the float
variant, but also used from ac3dec_fixed.c, which uses the integer
variant.
The result is memory corruption, leading to crashes.
So compile eac3dec.c once for each variant and adapt it, so that it
works with the integer variant.
A loss of precission and scaling bug has been fixed by the committer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3dec_fixed.c')
| -rw-r--r-- | libavcodec/ac3dec_fixed.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/ac3dec_fixed.c b/libavcodec/ac3dec_fixed.c index cb3b251589..b4beee6dd7 100644 --- a/libavcodec/ac3dec_fixed.c +++ b/libavcodec/ac3dec_fixed.c @@ -164,6 +164,7 @@ static void ac3_downmix_c_fixed16(int16_t **samples, int16_t (*matrix)[2], } } +#include "eac3dec.c" #include "ac3dec.c" static const AVOption options[] = { |