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 /libAACenc/src/aacenc.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 'libAACenc/src/aacenc.cpp')
| -rw-r--r-- | libAACenc/src/aacenc.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libAACenc/src/aacenc.cpp b/libAACenc/src/aacenc.cpp index 569662b..c47e882 100644 --- a/libAACenc/src/aacenc.cpp +++ b/libAACenc/src/aacenc.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 @@ -435,7 +435,9 @@ AAC_ENCODER_ERROR FDKaacEnc_Initialize(HANDLE_AAC_ENC hAacEnc, &averageBitsPerFrame, config->bitrateMode, config->nSubFrames - ) != config->bitRate ) + ) != config->bitRate + && !((config->bitrateMode>=1) && (config->bitrateMode<=5)) + ) { return AAC_ENC_UNSUPPORTED_BITRATE; } |