diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-27 14:39:49 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-27 14:39:49 -0800 |
| commit | d6459f539c03df17c6aa75915d31a9d8c8adcca2 (patch) | |
| tree | 34600137fef4e3746093c76605c3c9369a1fda7c /libAACenc | |
| parent | cce1e2106d431a65c02e056839b6b0a6aff50085 (diff) | |
| parent | f5512132f3850ab06a13b9e541cac51f6f389bf2 (diff) | |
| download | fdk-aac-d6459f539c03df17c6aa75915d31a9d8c8adcca2.tar.gz fdk-aac-d6459f539c03df17c6aa75915d31a9d8c8adcca2.tar.bz2 fdk-aac-d6459f539c03df17c6aa75915d31a9d8c8adcca2.zip | |
Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fb am: ecc96969d7
am: f5512132f3
Change-Id: Ie01b6d6c881c4c9a52af921eee9f7ced6fd6880e
Diffstat (limited to 'libAACenc')
| -rw-r--r-- | libAACenc/src/aacenc_lib.cpp | 3 | ||||
| -rw-r--r-- | libAACenc/src/bitenc.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libAACenc/src/aacenc_lib.cpp b/libAACenc/src/aacenc_lib.cpp index f92cff4..9e0630c 100644 --- a/libAACenc/src/aacenc_lib.cpp +++ b/libAACenc/src/aacenc_lib.cpp @@ -907,6 +907,7 @@ static AACENC_ERROR FDKaacEnc_AdjustEncSettings(HANDLE_AACENCODER hAacEncoder, case AOT_MP2_AAC_LC: case AOT_MP2_SBR: hAacConfig->usePns = 0; + FDK_FALLTHROUGH; case AOT_AAC_LC: case AOT_SBR: case AOT_PS: @@ -2091,12 +2092,14 @@ AACENC_ERROR aacEncoder_SetParam(const HANDLE_AACENCODER hAacEncoder, err = AACENC_INVALID_CONFIG; goto bail; } + FDK_FALLTHROUGH; case AOT_SBR: case AOT_MP2_SBR: if (!(hAacEncoder->encoder_modis & (ENC_MODE_FLAG_SBR))) { err = AACENC_INVALID_CONFIG; goto bail; } + FDK_FALLTHROUGH; case AOT_AAC_LC: case AOT_MP2_AAC_LC: case AOT_ER_AAC_LD: diff --git a/libAACenc/src/bitenc.cpp b/libAACenc/src/bitenc.cpp index 652d1fd..957e821 100644 --- a/libAACenc/src/bitenc.cpp +++ b/libAACenc/src/bitenc.cpp @@ -643,6 +643,7 @@ static INT FDKaacEnc_writeExtensionPayload(HANDLE_FDK_BITSTREAM hBitStream, FDKwriteBits(hBitStream, *extPayloadData++, 4); /* nibble */ } extBitsUsed += 4; + FDK_FALLTHROUGH; case EXT_DYNAMIC_RANGE: case EXT_SBR_DATA: case EXT_SBR_DATA_CRC: @@ -690,6 +691,7 @@ static INT FDKaacEnc_writeExtensionPayload(HANDLE_FDK_BITSTREAM hBitStream, case EXT_FILL_DATA: fillByte = 0xA5; + FDK_FALLTHROUGH; case EXT_FIL: default: if (hBitStream != NULL) { |