aboutsummaryrefslogtreecommitdiffstats
path: root/libAACdec/src/conceal.cpp
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2018-12-27 14:49:05 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-12-27 14:49:05 -0800
commit55efc0ade2f842b08e0cc5751bea2e206a1f408d (patch)
treec8d5c220175cfbc0c2996b852fa23da3694f9c75 /libAACdec/src/conceal.cpp
parent207025dc96dfa24027ed86bdce3bc99449e33716 (diff)
parentd6459f539c03df17c6aa75915d31a9d8c8adcca2 (diff)
downloadfdk-aac-55efc0ade2f842b08e0cc5751bea2e206a1f408d.tar.gz
fdk-aac-55efc0ade2f842b08e0cc5751bea2e206a1f408d.tar.bz2
fdk-aac-55efc0ade2f842b08e0cc5751bea2e206a1f408d.zip
Merge changes I97471c4d,I8a8626a8,I1f176740,I10da23ee,I9f9064fb am: ecc96969d7 am: f5512132f3
am: d6459f539c Change-Id: I15844b575d276334d5a960a73cf556f5f82fcff3
Diffstat (limited to 'libAACdec/src/conceal.cpp')
-rw-r--r--libAACdec/src/conceal.cpp1
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;