diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-05 16:11:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-05 16:11:23 +0000 |
| commit | 0713b4acff1a489e7d49725dc7c5e3dad370b5c8 (patch) | |
| tree | 6717743d4422e9d88e9a9f1631effd7563a9856b /libSBRenc/src/sbr_encoder.cpp | |
| parent | f86e64f5c712edc2f3dd0a9d59d75a8ebd3422ea (diff) | |
| parent | ef30836651bf059c3120c03dd11e08b6aafdae13 (diff) | |
| download | fdk-aac-0713b4acff1a489e7d49725dc7c5e3dad370b5c8.tar.gz fdk-aac-0713b4acff1a489e7d49725dc7c5e3dad370b5c8.tar.bz2 fdk-aac-0713b4acff1a489e7d49725dc7c5e3dad370b5c8.zip | |
Remove compiler warnings, revised ARM QMF encoder
am: ef30836
* commit 'ef30836651bf059c3120c03dd11e08b6aafdae13':
Remove compiler warnings, revised ARM QMF encoder
Change-Id: I07babb4dc36b6ad7aebeb62c303a8380e99d691e
Diffstat (limited to 'libSBRenc/src/sbr_encoder.cpp')
| -rw-r--r-- | libSBRenc/src/sbr_encoder.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libSBRenc/src/sbr_encoder.cpp b/libSBRenc/src/sbr_encoder.cpp index 464c013..221aecd 100644 --- a/libSBRenc/src/sbr_encoder.cpp +++ b/libSBRenc/src/sbr_encoder.cpp @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. +© Copyright 1995 - 2015 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -103,7 +103,7 @@ amm-info@iis.fraunhofer.de #define SBRENCODER_LIB_VL0 3 #define SBRENCODER_LIB_VL1 3 -#define SBRENCODER_LIB_VL2 4 +#define SBRENCODER_LIB_VL2 6 @@ -170,7 +170,6 @@ getSbrTuningTableIndex(UINT bitrate, /*! the total bitrate in bits/sec */ { int i, bitRateClosestLowerIndex=-1, bitRateClosestUpperIndex=-1, found = 0; UINT bitRateClosestUpper = 0, bitRateClosestLower=DISTANCE_CEIL_VALUE; - int isforThisCodec=0; #define isForThisCore(i) \ ( ( sbrTuningTable[i].coreCoder == CODEC_AACLD && core == AOT_ER_AAC_ELD ) || \ @@ -854,7 +853,7 @@ FDKsbrEnc_EnvEncodeFrame(HANDLE_SBR_ENCODER hEnvEncoder, int clearOutput /*!< Do not consider any input signal */ ) { - HANDLE_SBR_ELEMENT hSbrElement = hEnvEncoder->sbrElement[iElement]; + HANDLE_SBR_ELEMENT hSbrElement = NULL; FDK_CRCINFO crcInfo; INT crcReg; INT ch; |