diff options
| author | Martin Storsjo <martin@martin.st> | 2019-10-08 14:53:07 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2019-10-08 14:53:07 +0300 |
| commit | e365f4f27802954f0cf65d3e2eac88b7fdebc83c (patch) | |
| tree | d0ef656126c0ad2758164a0cf04136efccfe14c1 /libSBRdec/src/sbrdecoder.cpp | |
| parent | d387d3b6ed79ff9a82c60440bdd86e6e5e324bec (diff) | |
| parent | d929f68a05f5cbdd812dca287c8115a39439acf1 (diff) | |
| download | fdk-aac-e365f4f27802954f0cf65d3e2eac88b7fdebc83c.tar.gz fdk-aac-e365f4f27802954f0cf65d3e2eac88b7fdebc83c.tar.bz2 fdk-aac-e365f4f27802954f0cf65d3e2eac88b7fdebc83c.zip | |
Merge remote-tracking branch 'aosp/master'
Diffstat (limited to 'libSBRdec/src/sbrdecoder.cpp')
| -rw-r--r-- | libSBRdec/src/sbrdecoder.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libSBRdec/src/sbrdecoder.cpp b/libSBRdec/src/sbrdecoder.cpp index 4bc6f69..c827ced 100644 --- a/libSBRdec/src/sbrdecoder.cpp +++ b/libSBRdec/src/sbrdecoder.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -871,11 +871,10 @@ INT sbrDecoder_Header(HANDLE_SBRDECODER self, HANDLE_FDK_BITSTREAM hBs, if (sbrError == SBRDEC_OK) { hSbrHeader->syncState = SBR_HEADER; hSbrHeader->status |= SBRDEC_HDR_STAT_UPDATE; + } else { + hSbrHeader->syncState = SBR_NOT_INITIALIZED; + hSbrHeader->status = HEADER_ERROR; } - /* else { - Since we already have overwritten the old SBR header the only way out - is UPSAMPLING! This will be prepared in the next step. - } */ } } } |