diff options
author | Martin Storsjo <martin@martin.st> | 2016-05-18 09:36:12 +0300 |
---|---|---|
committer | Martin Storsjo <martin@martin.st> | 2016-05-18 09:36:12 +0300 |
commit | 8fe6faf261313279879f7fbce8798f03aa63ebd5 (patch) | |
tree | 39d67cd6aa0b970eef549eb090dba17c83f26aa4 /libSBRenc | |
parent | f132ac5f3dd37f9810b40d36caaa53e0f4ecfd06 (diff) | |
parent | 8192b1a98f60cc39253c658ba1ca70a70c2e0dfa (diff) | |
download | fdk-aac-8fe6faf261313279879f7fbce8798f03aa63ebd5.tar.gz fdk-aac-8fe6faf261313279879f7fbce8798f03aa63ebd5.tar.bz2 fdk-aac-8fe6faf261313279879f7fbce8798f03aa63ebd5.zip |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libSBRenc')
-rw-r--r-- | libSBRenc/src/sbr_encoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libSBRenc/src/sbr_encoder.cpp b/libSBRenc/src/sbr_encoder.cpp index 464c013..abe9793 100644 --- a/libSBRenc/src/sbr_encoder.cpp +++ b/libSBRenc/src/sbr_encoder.cpp @@ -1851,10 +1851,10 @@ INT sbrEncoder_Init( if ( (aot==AOT_PS) || (aot==AOT_MP2_PS) || (aot==AOT_DABPLUS_PS) || (aot==AOT_DRM_MPEG_PS) ) { usePs = 1; } - if ( (aot==AOT_ER_AAC_ELD) ) { + if ( aot==AOT_ER_AAC_ELD ) { lowDelay = 1; } - else if ( (aot==AOT_ER_AAC_LD) ) { + else if ( aot==AOT_ER_AAC_LD ) { error = 1; goto bail; } |