diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /media/libopus/celt | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.gz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.lz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.xz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'media/libopus/celt')
| -rw-r--r-- | media/libopus/celt/rate.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/media/libopus/celt/rate.c b/media/libopus/celt/rate.c index 29b26c65b..9062ff750 100644 --- a/media/libopus/celt/rate.c +++ b/media/libopus/celt/rate.c @@ -524,12 +524,6 @@ static OPUS_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end, return codedBands; } -#if !defined(__clang__) && defined(__GNUC__) && defined(__arm__) && \ - __GNUC__ == 4 && __GNUC_MINOR__ == 8 -#warning "OPUS library causes an internal compiler error for gcc-4.8 based toolchain in arm" -#pragma GCC push_options -#pragma GCC optimize ("O0") -#endif int compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stereo, opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth) { @@ -642,7 +636,3 @@ int compute_allocation(const CELTMode *m, int start, int end, const int *offsets RESTORE_STACK; return codedBands; } -#if !defined(__clang__) && defined(__GNUC__) && defined(__arm__) && \ - __GNUC__ == 4 && __GNUC_MINOR__ == 8 -#pragma GCC pop_options -#endif |