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 /libAACdec/src/conceal.cpp | |
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 'libAACdec/src/conceal.cpp')
-rw-r--r-- | libAACdec/src/conceal.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libAACdec/src/conceal.cpp b/libAACdec/src/conceal.cpp index 569d672..5895cb8 100644 --- a/libAACdec/src/conceal.cpp +++ b/libAACdec/src/conceal.cpp @@ -1894,6 +1894,7 @@ INT CConcealment_TDFading( case ConcealState_FadeIn: idx = cntFadeFrames; idx -= TDFadeInStopBeforeFullLevel; + FDK_FALLTHROUGH; case ConcealState_Ok: fadeFactor = pConcealParams->fadeInFactor; idx = (concealState == ConcealState_Ok) ? -1 : idx; |