diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-12-27 14:28:38 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-27 14:28:38 -0800 |
| commit | f5512132f3850ab06a13b9e541cac51f6f389bf2 (patch) | |
| tree | e78e88638c742d3dcd5f704d6ad50758d256a945 /libAACdec/src/conceal.cpp | |
| parent | 2027969e1f72be4464e48f1bc0065b2bed1590b9 (diff) | |
| parent | ecc96969d7db139242dbba9930857ed5ce955b29 (diff) | |
| download | fdk-aac-f5512132f3850ab06a13b9e541cac51f6f389bf2.tar.gz fdk-aac-f5512132f3850ab06a13b9e541cac51f6f389bf2.tar.bz2 fdk-aac-f5512132f3850ab06a13b9e541cac51f6f389bf2.zip | |
Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fb
am: ecc96969d7
Change-Id: I588392116ecdf22e1266ec6fff8416fa87d911c4
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 a6064b6..cc6de75 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; |