diff options
| author | Ted Hess <thess@kitschensync.net> | 2019-02-28 18:27:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-28 18:27:51 -0500 |
| commit | 64c94b329f223b7d37ecbc3f648b09b31b37afc4 (patch) | |
| tree | 3b46a628f4cd15a6a4ff26222d5df24b9b5f4d27 | |
| parent | f3dfff7dfa7336d64ec7e5acdfc9d5ce661099a5 (diff) | |
| parent | 7886a46c0db662025b3b2ce41a5df6c0441d8b07 (diff) | |
Merge pull request #8152 from diizzyy/sound/fdk-aac-20
sound/fdk-aac: Update to 2.0.0
| -rw-r--r-- | sound/fdk-aac/Makefile | 6 | ||||
| -rw-r--r-- | sound/fdk-aac/patches/001-fix-overflow.patch | 29 |
2 files changed, 3 insertions, 32 deletions
diff --git a/sound/fdk-aac/Makefile b/sound/fdk-aac/Makefile index ed9606be5..6e2ffff9b 100644 --- a/sound/fdk-aac/Makefile +++ b/sound/fdk-aac/Makefile @@ -6,15 +6,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fdk-aac -PKG_VERSION:=0.1.6 -PKG_RELEASE:=2 +PKG_VERSION:=2.0.0 +PKG_RELEASE:=1 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net> PKG_LICENSE:=Fraunhofer-FDK-AAC-for-Android PKG_LICENSE_FILES:=NOTICE PKG_SOURCE_URL=https://codeload.github.com/mstorsjo/fdk-aac/tar.gz/v$(PKG_VERSION)? PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=adbcd793e406e1b88b3c1c41382d49f8c27371485b823c0fdab69c9124fd2ce3 +PKG_HASH:=6e6c7921713788e31df655911e1d42620b057180b00bf16874f5d630e1d5b9a2 PKG_FIXUP:=autoreconf PKG_INSTALL:=1 diff --git a/sound/fdk-aac/patches/001-fix-overflow.patch b/sound/fdk-aac/patches/001-fix-overflow.patch deleted file mode 100644 index 89728d91f..000000000 --- a/sound/fdk-aac/patches/001-fix-overflow.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a50eecf65b5ce5d4f03768c5c2cb4b492d2badad Mon Sep 17 00:00:00 2001 -From: Martin Storsjo <martin@martin.st> -Date: Fri, 4 May 2018 12:46:44 +0300 -Subject: [PATCH] Fix overflows in accumulation, fixing crashes - -This fixes github issue #83. ---- - libSBRenc/src/tran_det.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libSBRenc/src/tran_det.cpp b/libSBRenc/src/tran_det.cpp -index 0e35ec3..51d6efe 100644 ---- a/libSBRenc/src/tran_det.cpp -+++ b/libSBRenc/src/tran_det.cpp -@@ -256,12 +256,12 @@ static FIXP_DBL addLowbandEnergies(FIXP_DBL **Energies, - /* freqBandTable[LORES] has MAX_FREQ_COEFFS/2 +1 coeefs max. */ - for (ts=tran_offdiv2; ts<YBufferWriteOffset; ts++) { - for (k = 0; k < freqBandTable[0]; k++) { -- accu1 += Energies[ts][k] >> 6; -+ accu1 = fAddSaturate(accu1, Energies[ts][k] >> 6); - } - } - for (; ts<tran_offdiv2+(slots>>nrgSzShift); ts++) { - for (k = 0; k < freqBandTable[0]; k++) { -- accu2 += Energies[ts][k] >> 9; -+ accu2 = fAddSaturate(accu2, Energies[ts][k] >> 9); - } - } - |